Merge branch 'master' into upstream-merge-29940
This commit is contained in:
@@ -327,6 +327,7 @@
|
||||
if(AM.pulledby)
|
||||
if(!supress_message)
|
||||
visible_message("<span class='danger'>[src] has pulled [AM] from [AM.pulledby]'s grip.</span>")
|
||||
add_logs(AM, AM.pulledby, "pulled from", src)
|
||||
AM.pulledby.stop_pulling() //an object can't be pulled by two mobs at once.
|
||||
|
||||
pulling = AM
|
||||
@@ -337,6 +338,7 @@
|
||||
|
||||
if(ismob(AM))
|
||||
var/mob/M = AM
|
||||
add_logs(src, M, "grabbed", addition="passive grab")
|
||||
if(!supress_message)
|
||||
visible_message("<span class='warning'>[src] has grabbed [M] passively!</span>")
|
||||
if(!iscarbon(src))
|
||||
|
||||
Reference in New Issue
Block a user