Fix dragging through firelocks #7418
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Yes finally speedmerge THIS IS WHAT IS NEEDED the answer to our prayers all hail #7418 |
alexkar598
requested changes
Dec 29, 2019
| for(var/mob/living/M in T1) | ||
| if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T2) | ||
| to_chat(M, "<span class='notice'>You pull [M.pulling] through [src] right as it closes</span>") | ||
| M.pulling.forceMove(T1) |
There was a problem hiding this comment.
Whoa whoa whoa, ripping people from chairs as the firelock closes?
Suggested change
| M.pulling.forceMove(T1) | |
| M.pulling.Move_Pulled(T1) |
| for(var/mob/living/M in T2) | ||
| if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T1) | ||
| to_chat(M, "<span class='notice'>You pull [M.pulling] through [src] right as it closes</span>") | ||
| M.pulling.forceMove(T2) |
There was a problem hiding this comment.
Suggested change
| M.pulling.forceMove(T2) | |
| M.pulling.Move_Pulled(T2) |
|
s p e e d m e r g e |
alexkar598
requested changes
Dec 31, 2019
yogstation13-bot
added a commit
that referenced
this pull request
Jan 1, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
馃啈 monster860
tweak: When an edge firelock closes, if it closes between someone and something they're dragging it automatically pulls the thing they're dragging through.
/:cl: