Skip to content

Commit

Permalink
Prevents pushing the person wh() is pulling you (ParadiseSS13#23746)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rerik007 authored Jan 8, 2024
1 parent 44cde7c commit 2c7a9b3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/living/living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
to_chat(src, "<span class='warning'>[L] is restrained, you cannot push past.</span>")
return TRUE

if(pulledby == L && a_intent != INTENT_HELP) //prevents boosting the person pulling you, but you can still move through them on help intent
if(pulledby == L && (a_intent != INTENT_HELP || L.a_intent != INTENT_HELP)) //prevents boosting the person pulling you, but you can still move through them on help intent
return TRUE

if(L.pulling)
Expand Down

0 comments on commit 2c7a9b3

Please sign in to comment.