From 0eb1fdd9dcb71be9414ba32692994dd20ed49a83 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 25 Aug 2019 11:19:01 -0700 Subject: [PATCH 1/2] Update mood.dm --- code/datums/components/mood.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 730ffa9ff0..9a0852e0d5 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -147,11 +147,13 @@ if(9) IncreaseSanity(0.4, SANITY_GREAT) +/* if(insanity_effect != holdmyinsanityeffect) if(insanity_effect > holdmyinsanityeffect) owner.crit_threshold += (insanity_effect - holdmyinsanityeffect) else owner.crit_threshold -= (holdmyinsanityeffect - insanity_effect) +*/ if(HAS_TRAIT(owner, TRAIT_DEPRESSION)) if(prob(0.05)) @@ -215,7 +217,7 @@ if(newval == insanity_effect) return var/mob/living/master = parent - master.crit_threshold = (master.crit_threshold - insanity_effect) + newval + //master.crit_threshold = (master.crit_threshold - insanity_effect) + newval insanity_effect = newval /datum/component/mood/proc/DecreaseSanity(amount, minimum = SANITY_INSANE) From 1e6845491dec938755e22b03bd4022a8fadcf691 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 26 Aug 2019 19:54:34 -0700 Subject: [PATCH 2/2] Update mood.dm --- code/datums/components/mood.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 9a0852e0d5..e86f246bba 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -216,7 +216,7 @@ /datum/component/mood/proc/setInsanityEffect(newval)//More code so that the previous proc works if(newval == insanity_effect) return - var/mob/living/master = parent + //var/mob/living/master = parent //master.crit_threshold = (master.crit_threshold - insanity_effect) + newval insanity_effect = newval