From c2e991bc7e12c56b7ce0d8c3f40256805e6818dd Mon Sep 17 00:00:00 2001 From: MrCastmer <125900379+MrCastmer@users.noreply.github.com> Date: Sat, 24 Feb 2024 15:05:35 +0300 Subject: [PATCH 1/2] Alters do_after delay based on how sane you are --- code/modules/mob/living/carbon/carbon.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d04f8899ad5e..690fa8f5b6c7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -979,11 +979,14 @@ . = ..() var/datum/component/mood/mood = GetComponent(/datum/component/mood) //Currently, only carbons or higher use mood, move this once that changes. if(mood) + . *= 2 - (mood.sanity / 100) //Alters do_after delay based on how sane you are, dripstation edit +/* //dripstation edit switch(mood.sanity) //Alters do_after delay based on how sane you are if(-INFINITY to SANITY_DISTURBED) . *= 1.25 if(SANITY_NEUTRAL to INFINITY) . *= 0.90 +*/ //dripstation edit for(var/datum/status_effect/S as anything in status_effects) . *= S.interact_speed_modifier() From 8ca1e9634c5fb76376da54c65797790be55c4730 Mon Sep 17 00:00:00 2001 From: MrCastmer <125900379+MrCastmer@users.noreply.github.com> Date: Sat, 24 Feb 2024 16:20:04 +0300 Subject: [PATCH 2/2] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d8d679288865..b3e33e775fce 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -971,13 +971,13 @@ var/datum/component/mood/mood = GetComponent(/datum/component/mood) //Currently, only carbons or higher use mood, move this once that changes. if(mood) . *= 2 - (mood.sanity / 100) //Alters do_after delay based on how sane you are, dripstation edit -/* //dripstation edit +/* switch(mood.sanity) //Alters do_after delay based on how sane you are if(-INFINITY to SANITY_DISTURBED) . *= 1.25 if(SANITY_NEUTRAL to INFINITY) . *= 0.90 -*/ //dripstation edit +*/ for(var/datum/status_effect/S as anything in status_effects) . *= S.interact_speed_modifier()