From f0c1890a657bc0e247d4603bf752e22c3bfeec2e Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 5 Dec 2020 02:48:33 +0100 Subject: [PATCH 1/2] fix --- code/modules/mob/living/living.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2accfe7d0d..d7cded7ccc 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -307,7 +307,9 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) if((zone_selected == BODY_ZONE_PRECISE_GROIN) && has_tail() && M.has_tail()) - visible_message("[src] coils [p_their()] tail with [AM], pulling [M.p_them()] along!", "[src] has entwined [p_their()] tail with yours, pulling you along!") + visible_message("[src] coils [p_their()] tail with [M]'s, pulling [M.p_them()] along!", "You entwine your tail with [M]'s, pulling [M.p_them()] along!", ignored_mobs = M) + M.show_message("[src] has entwined [p_their()] tail with yours, pulling you along!", MSG_VISUAL, "You feel something coiling around your tail, pulling you along!") + else visible_message("[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by [M.p_their()] hands":" passively"]!", "You have grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by [M.p_their()] hands":" passively"]!", target = M, From 0c4e9ca1c598f5a3d7f6ca9e4a0b7beeadccc273 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 5 Dec 2020 02:56:03 +0100 Subject: [PATCH 2/2] better phrasing --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index d7cded7ccc..78de091923 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -307,7 +307,7 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) if((zone_selected == BODY_ZONE_PRECISE_GROIN) && has_tail() && M.has_tail()) - visible_message("[src] coils [p_their()] tail with [M]'s, pulling [M.p_them()] along!", "You entwine your tail with [M]'s, pulling [M.p_them()] along!", ignored_mobs = M) + visible_message("[src] coils [p_their()] tail with [M]'s, pulling [M.p_them()] along!", "You entwine tails with [M], pulling [M.p_them()] along!", ignored_mobs = M) M.show_message("[src] has entwined [p_their()] tail with yours, pulling you along!", MSG_VISUAL, "You feel something coiling around your tail, pulling you along!") else