From 1188431bcb469b220e2bcca92123d972e9ec5e9b Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 13 Jan 2021 22:40:13 -0700 Subject: [PATCH] Update carbon_defense.dm --- code/modules/mob/living/carbon/carbon_defense.dm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 7a16d5c352..17712330de 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -304,10 +304,16 @@ emote("wag") else if(check_zone(M.zone_selected) == BODY_ZONE_R_ARM || check_zone(M.zone_selected) == BODY_ZONE_L_ARM) - M.visible_message( \ - "[M] shakes [src]'s hand.", \ - "You shake [src]'s hand.", target = src, - target_message = "[M] shakes your hand.") + if((pulling == M) && (grab_state == GRAB_PASSIVE)) + M.visible_message( \ + "[M] squeezes [src]'s hand., \ + "You shake [src]'s hand.", target = src, + target_message = "[M] squeezes your hand.") + else + M.visible_message( \ + "[M] shakes [src]'s hand.", \ + "You shake [src]'s hand.", target = src, + target_message = "[M] shakes your hand.") else M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \