From 6527848b900099469314bfb0dc83360cbf8998de Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 6 Jun 2021 19:24:29 -0300 Subject: [PATCH 1/6] Revamps Apathy --- code/__DEFINES/traits.dm | 1 + code/datums/traits/good.dm | 1 + code/modules/mob/living/carbon/death.dm | 6 ------ code/modules/mob/living/carbon/human/death.dm | 7 +++++++ hyperstation/code/datums/mood_events/events.dm | 6 +++--- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 1dd7ce26..50014406 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -194,6 +194,7 @@ #define TRAIT_VIRILE "virile" //you have 20% more chance of impreg #define TRAIT_MACROPHILE "macrophile" //likes the big #define TRAIT_MICROPHILE "microphile" //likes the small +#define TRAIT_APATHETIC "apathetic" //doesn't care #define TRAIT_TOUGH "tough" //you have 10% more maxhealth #define TRAIT_AUTO_CATCH_ITEM "auto_catch_item" diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index b1e073b9..fc4124a2 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -16,6 +16,7 @@ desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess." value = 1 category = CATEGORY_MOODS + mob_trait = TRAIT_APATHETIC mood_quirk = TRUE medical_record_text = "Patient was administered the Apathy Evaluation Scale but did not bother to complete it." diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index 4b91526b..6182befe 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -19,12 +19,6 @@ if(SSticker.mode) SSticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now - //watching someone die is traumatic - for(var/mob/living/carbon/human/H in oview(5, src)) - 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 - /mob/living/carbon/gib(no_brain, no_organs, no_bodyparts) var/atom/Tsec = drop_location() for(var/mob/M in src) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index f61c8741..e93eae25 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -52,6 +52,13 @@ if(is_devil(src)) INVOKE_ASYNC(is_devil(src), /datum/antagonist/devil.proc/beginResurrectionCheck, src) + //watching someone die is traumatic + for(var/mob/living/carbon/human/H in oview(5, src)) + if(!HAS_TRAIT(H, TRAIT_APATHETIC)) + 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 + /mob/living/carbon/human/proc/makeSkeleton() ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC) set_species(/datum/species/skeleton) diff --git a/hyperstation/code/datums/mood_events/events.dm b/hyperstation/code/datums/mood_events/events.dm index 6ef7c115..a82050e2 100644 --- a/hyperstation/code/datums/mood_events/events.dm +++ b/hyperstation/code/datums/mood_events/events.dm @@ -15,10 +15,10 @@ /datum/mood_event/deathsaw description = "I saw someone die!\n" - mood_change = -8 - timeout = 20 MINUTES //takes a long time to get over + mood_change = -5 + timeout = 3 MINUTES //20 minutes is too much, medical is moving around sluggishly because of this constantly. /datum/mood_event/healsbadman description = "I feel like I'm held together by flimsy string, and could fall apart at any moment!\n" mood_change = -4 - timeout = 2 MINUTES \ No newline at end of file + timeout = 2 MINUTES From db7e03157e26a30a8b073041274ab8c34535aca9 Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 6 Jun 2021 19:25:55 -0300 Subject: [PATCH 2/6] Double var --- code/modules/mob/living/carbon/human/death.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index e93eae25..69172745 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -53,11 +53,11 @@ INVOKE_ASYNC(is_devil(src), /datum/antagonist/devil.proc/beginResurrectionCheck, src) //watching someone die is traumatic - for(var/mob/living/carbon/human/H in oview(5, src)) - if(!HAS_TRAIT(H, TRAIT_APATHETIC)) - SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw) + for(var/mob/living/carbon/human/C in oview(5, src)) + if(!HAS_TRAIT(C, TRAIT_APATHETIC)) + SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw) if(prob(10)) //10% chance to pump adrenaline into their body - H.jitteriness += 5 + C.jitteriness += 5 /mob/living/carbon/human/proc/makeSkeleton() ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC) From 81377a6255a5477abebf78599747021d6cdcb72f Mon Sep 17 00:00:00 2001 From: Archie Date: Mon, 7 Jun 2021 16:46:32 -0300 Subject: [PATCH 3/6] 10 --- hyperstation/code/datums/mood_events/events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperstation/code/datums/mood_events/events.dm b/hyperstation/code/datums/mood_events/events.dm index a82050e2..a92b0fa7 100644 --- a/hyperstation/code/datums/mood_events/events.dm +++ b/hyperstation/code/datums/mood_events/events.dm @@ -16,7 +16,7 @@ /datum/mood_event/deathsaw description = "I saw someone die!\n" mood_change = -5 - timeout = 3 MINUTES //20 minutes is too much, medical is moving around sluggishly because of this constantly. + timeout = 10 MINUTES //20 minutes is too much, medical is moving around sluggishly because of this constantly. /datum/mood_event/healsbadman description = "I feel like I'm held together by flimsy string, and could fall apart at any moment!\n" From 7b835c21288b0dc0d70361586da4952e15f361ca Mon Sep 17 00:00:00 2001 From: Archie Date: Mon, 7 Jun 2021 17:47:39 -0300 Subject: [PATCH 4/6] Better logic. --- code/modules/mob/living/carbon/human/death.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 69172745..a589df81 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -54,10 +54,11 @@ //watching someone die is traumatic for(var/mob/living/carbon/human/C in oview(5, src)) - if(!HAS_TRAIT(C, TRAIT_APATHETIC)) - SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw) - if(prob(10)) //10% chance to pump adrenaline into their body - C.jitteriness += 5 + if(C.mind) //We don't need to give this to anything that doesn't have a mind. That's wasted processing. + if(!HAS_TRAIT(C, TRAIT_APATHETIC) || !C.mind.assigned_role == "Medical Doctor") //Shamelessly stolen from the Doctor's Delight + SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw) + if(prob(10)) //10% chance to pump adrenaline into their body + C.jitteriness += 5 /mob/living/carbon/human/proc/makeSkeleton() ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC) From 6e495567ce6250a405ce6431291430c780e830d5 Mon Sep 17 00:00:00 2001 From: ArchieBeepBoop <53913550+ArchieBeepBoop@users.noreply.github.com> Date: Fri, 11 Jun 2021 21:54:52 -0300 Subject: [PATCH 5/6] Update hyperstation/code/datums/mood_events/events.dm Co-authored-by: Dahlular <55758850+Dahlular@users.noreply.github.com> --- hyperstation/code/datums/mood_events/events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperstation/code/datums/mood_events/events.dm b/hyperstation/code/datums/mood_events/events.dm index a92b0fa7..01bbcf51 100644 --- a/hyperstation/code/datums/mood_events/events.dm +++ b/hyperstation/code/datums/mood_events/events.dm @@ -16,7 +16,7 @@ /datum/mood_event/deathsaw description = "I saw someone die!\n" mood_change = -5 - timeout = 10 MINUTES //20 minutes is too much, medical is moving around sluggishly because of this constantly. + timeout = 20 MINUTES //20 minutes is too much, medical is moving around sluggishly because of this constantly. /datum/mood_event/healsbadman description = "I feel like I'm held together by flimsy string, and could fall apart at any moment!\n" From 0dea745d057d2000e51b169447d951fd39b0593c Mon Sep 17 00:00:00 2001 From: ArchieBeepBoop <53913550+ArchieBeepBoop@users.noreply.github.com> Date: Fri, 11 Jun 2021 21:55:51 -0300 Subject: [PATCH 6/6] Comment --- hyperstation/code/datums/mood_events/events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperstation/code/datums/mood_events/events.dm b/hyperstation/code/datums/mood_events/events.dm index 01bbcf51..5c58d9ab 100644 --- a/hyperstation/code/datums/mood_events/events.dm +++ b/hyperstation/code/datums/mood_events/events.dm @@ -16,7 +16,7 @@ /datum/mood_event/deathsaw description = "I saw someone die!\n" mood_change = -5 - timeout = 20 MINUTES //20 minutes is too much, medical is moving around sluggishly because of this constantly. + timeout = 20 MINUTES //May be fine tuned in the future. /datum/mood_event/healsbadman description = "I feel like I'm held together by flimsy string, and could fall apart at any moment!\n"