diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index b19af6342c..32b5284b3f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -362,7 +362,11 @@ add_logs(src, M, "grabbed", addition="passive grab") if(!supress_message) +<<<<<<< HEAD visible_message("[src] has grabbed [M] passively!") +======= + visible_message("[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands":" passively"]!") +>>>>>>> af87ed3... grammar if(!iscarbon(src)) M.LAssailant = null else