adds handholding

2017-12-24 22:50:33 -08:00
parent a034383e15
commit c8788ed4f7
1 changed files with 4 additions and 0 deletions
@@ -362,7 +362,11 @@

 		add_logs(src, M, "grabbed", addition="passive grab")
 		if(!supress_message)
+<<<<<<< HEAD
 			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>")
+>>>>>>> af87ed3... grammar
 		if(!iscarbon(src))
 			M.LAssailant = null
 		else