Merge pull request #10018 from dovydas12345/Dead-pull

Fixes being able to pull when incapacitated
This commit is contained in:
variableundefined
2018-10-28 08:45:11 +08:00
committed by GitHub
+2 -1
View File
@@ -5,6 +5,8 @@
return
if(!AM || !isturf(AM.loc)) //if there's no object or the object being pulled is inside something: abort!
return
if(!incapacitated())
return
if(!(AM.anchored))
AM.add_fingerprint(src)
@@ -14,7 +16,6 @@
if(AM == pulling)
return
stop_pulling()
if(AM.pulledby)
visible_message("<span class='danger'>[src] has pulled [AM] from [AM.pulledby]'s grip.</span>")
AM.pulledby.stop_pulling() //an object can't be pulled by two mobs at once.