Skip to content

Commit

Permalink
[ci skip] Test merge commit for pull request #33831
Browse files Browse the repository at this point in the history
Server Instance: Sybil
  • Loading branch information
tgstation-server committed Dec 27, 2017
2 parents 585674c + af87ed3 commit ec46509
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/mob.dm
Expand Up @@ -362,7 +362,7 @@

add_logs(src, M, "grabbed", addition="passive grab")
if(!supress_message)
visible_message("<span class='warning'>[src] has grabbed [M] passively!</span>")
visible_message("<span class='warning'>[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands":" passively"]!</span>")
if(!iscarbon(src))
M.LAssailant = null
else
Expand Down

0 comments on commit ec46509

Please sign in to comment.