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 1/3] 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!", \
From 05fcd10506c567d843ea44346856712660512ef0 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 13 Jan 2021 22:46:01 -0700
Subject: [PATCH 2/3] Update carbon_defense.dm
---
code/modules/mob/living/carbon/carbon_defense.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 17712330de..35b6d5eb31 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -306,7 +306,7 @@
else if(check_zone(M.zone_selected) == BODY_ZONE_R_ARM || check_zone(M.zone_selected) == BODY_ZONE_L_ARM)
if((pulling == M) && (grab_state == GRAB_PASSIVE))
M.visible_message( \
- "[M] squeezes [src]'s hand., \
+ "[M] squeezes [src]'s hand.", \
"You shake [src]'s hand.", target = src,
target_message = "[M] squeezes your hand.")
else
From a9b3e6a514bf49912b8dea17511eabf309c91746 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 14 Jan 2021 04:33:15 -0700
Subject: [PATCH 3/3] Update carbon_defense.dm
---
code/modules/mob/living/carbon/carbon_defense.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 35b6d5eb31..b2c14c30fe 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -307,7 +307,7 @@
if((pulling == M) && (grab_state == GRAB_PASSIVE))
M.visible_message( \
"[M] squeezes [src]'s hand.", \
- "You shake [src]'s hand.", target = src,
+ "You squeeze [src]'s hand.", target = src,
target_message = "[M] squeezes your hand.")
else
M.visible_message( \