From 5af77b44825ee5d6f58e69eb6594e68923a14ac1 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Tue, 27 Apr 2021 19:53:18 +0100 Subject: [PATCH] death causes mood debuffs and possible jitterness watching some die is trumatic, and shouldnt be taken lightly. doesnt stack, 20min cool down. --- code/modules/mob/living/carbon/death.dm | 12 ++++++++++-- hyperstation/code/datums/mood_events/events.dm | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index d6b8d7d7..3b82f023 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -7,15 +7,23 @@ if(!gibbed) emote("deathgasp") + + //watching someone die is trumatic... + for(var/mob/living/carbon/human/H in oview(5, src)) + if(H.client && (src /= H)) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw) + if(prob(10)) //10% chance to pump adrenaline into their body + H.jitteriness += 5 + if(combatmode) toggle_combat_mode(TRUE, TRUE) . = ..() - + for(var/T in get_traumas()) var/datum/brain_trauma/BT = T BT.on_death() - + if(SSticker.mode) SSticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now diff --git a/hyperstation/code/datums/mood_events/events.dm b/hyperstation/code/datums/mood_events/events.dm index ae5b08a9..2a5e66f8 100644 --- a/hyperstation/code/datums/mood_events/events.dm +++ b/hyperstation/code/datums/mood_events/events.dm @@ -11,4 +11,9 @@ /datum/mood_event/kiss description = "Someone kissed me, I feel happy!\n" mood_change = 2 - timeout = 3 MINUTES \ No newline at end of file + timeout = 3 MINUTES + +/datum/mood_event/deathsaw + description = "I saw someone die!\n" + mood_change = -8 + timeout = 20 MINUTES //takes a long time to get over \ No newline at end of file