From 3fe78be52ce275acea7988ee5ee27a01ec1a8d10 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 17 Nov 2020 00:46:06 +0100 Subject: [PATCH] [MIRROR] Add tail entwining (#1702) * Add tail entwining I think this feature could really assist some of our manuel players in roleplaying the true depth of their commitments to each other. Also lepi said they would let me pat their head if I added this so I have no choice really * Add tail entwining * Update living.dm * Update living.dm * Update living.dm Co-authored-by: oranges Co-authored-by: Azarak --- code/modules/mob/living/living.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 6632e4137ff..6d0b48e53a3 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -293,9 +293,14 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) - M.visible_message("[src] grabs [M] [(zone_selected == "l_arm" || zone_selected == "r_arm" && ishuman(M))? "by their hands":"passively"]!", \ + //if(isfelinid(AM) && isfelinid(src)) //ORIGINAL + if(zone_selected == BODY_ZONE_PRECISE_GROIN && M.getorganslot(ORGAN_SLOT_TAIL) && src.getorganslot(ORGAN_SLOT_TAIL)) //SKYRAT EDIT CHANGE + M.visible_message("[src] coils their tail with [AM], wow is that okay in public?!", "[src] has entwined their tail with yours!") + to_chat(src, "You entwine your tail with [AM]") + else + M.visible_message("[src] grabs [M] [(zone_selected == "l_arm" || zone_selected == "r_arm" && ishuman(M))? "by their hands":"passively"]!", \ "[src] grabs you [(zone_selected == "l_arm" || zone_selected == "r_arm" && ishuman(M))? "by your hands":"passively"]!", null, null, src) - to_chat(src, "You grab [M] [(zone_selected == "l_arm" || zone_selected == "r_arm" && ishuman(M))? "by their hands":"passively"]!") + to_chat(src, "You grab [M] [(zone_selected == "l_arm" || zone_selected == "r_arm" && ishuman(M))? "by their hands":"passively"]!") if(!iscarbon(src)) M.LAssailant = null else