From 666fcdbd9cf4c1ac8246f462d0ef1750e072f63c Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Thu, 18 Nov 2021 22:05:59 +1100 Subject: [PATCH] Fixes an oversight with tail pulling and the Bad Touch trait (#62784) --- code/datums/quirks/negative.dm | 4 ++-- code/modules/mob/living/carbon/carbon_defense.dm | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/datums/quirks/negative.dm b/code/datums/quirks/negative.dm index 85b931bad02..3a39830e592 100644 --- a/code/datums/quirks/negative.dm +++ b/code/datums/quirks/negative.dm @@ -833,10 +833,10 @@ hardcore_value = 1 /datum/quirk/bad_touch/add() - RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT), .proc/uncomfortable_touch) + RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT, COMSIG_CARBON_TAILPULL), .proc/uncomfortable_touch) /datum/quirk/bad_touch/remove() - UnregisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT)) + UnregisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT, COMSIG_CARBON_TAILPULL)) /datum/quirk/bad_touch/proc/uncomfortable_touch() SIGNAL_HANDLER diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index b6b1f7bb546..1e476b076d7 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -423,7 +423,11 @@ null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(M, src)) to_chat(M, span_notice("You pull on [src]'s tail!")) to_chat(src, span_notice("[M] pulls on your tail!")) - SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "tailpulled", /datum/mood_event/tailpulled) + if(HAS_TRAIT(src, TRAIT_BADTOUCH)) //How dare they! + to_chat(M, span_warning("[src] makes a grumbling noise as you pull on [p_their()] tail.")) + else + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "tailpulled", /datum/mood_event/tailpulled) + else SEND_SIGNAL(src, COMSIG_CARBON_HUGGED, M) SEND_SIGNAL(M, COMSIG_CARBON_HUG, M, src)