From 9331b26a21ce88c82e4267392954342ec2e6ab99 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 13 Feb 2020 01:42:27 -0700 Subject: [PATCH 1/4] Update DNA.dm --- code/__DEFINES/DNA.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 6913473e88..9ebe6bb552 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -138,8 +138,8 @@ ////organ defines #define STANDARD_ORGAN_THRESHOLD 100 -#define STANDARD_ORGAN_HEALING 0.001 -#define STANDARD_ORGAN_DECAY 0.00222 //designed to fail organs when left to decay for ~15 minutes +#define STANDARD_ORGAN_HEALING (1/(15 MINUTES / 1 SECOND)) +#define STANDARD_ORGAN_DECAY (1/(15 MINUTES / 1 SECOND)) //designed to fail organs when left to decay for ~15 minutes. 1 SECOND is SSmobs tickrate. #define G_MALE 1 #define G_FEMALE 2 From e4f6131dcf74e2c5a572397e802f6b45783a7b52 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 13 Feb 2020 01:51:16 -0700 Subject: [PATCH 2/4] Update brain_item.dm --- code/modules/mob/living/brain/brain_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index a14fdb0b53..3b64c35969 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -10,7 +10,7 @@ organ_flags = ORGAN_VITAL attack_verb = list("attacked", "slapped", "whacked") ///The brain's organ variables are significantly more different than the other organs, with half the decay rate for balance reasons, and twice the maxHealth - decay_factor = STANDARD_ORGAN_DECAY / 4 //30 minutes of decaying to result in a fully damaged brain, since a fast decay rate would be unfun gameplay-wise + decay_factor = STANDARD_ORGAN_DECAY / 2 //30 minutes of decaying to result in a fully damaged brain, since a fast decay rate would be unfun gameplay-wise healing_factor = STANDARD_ORGAN_HEALING / 2 maxHealth = BRAIN_DAMAGE_DEATH From 14add89a5eaf6abd80b40a62c261556d485efcd6 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 13 Feb 2020 01:52:00 -0700 Subject: [PATCH 3/4] Update heart.dm --- code/modules/surgery/organs/heart.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 77aa302f8c..5767e84c73 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -6,7 +6,7 @@ slot = ORGAN_SLOT_HEART healing_factor = STANDARD_ORGAN_HEALING - decay_factor = 2.5 * STANDARD_ORGAN_DECAY //designed to fail about 5 minutes after death + decay_factor = 2 * STANDARD_ORGAN_DECAY low_threshold_passed = "Prickles of pain appear then die out from within your chest..." high_threshold_passed = "Something inside your chest hurts, and the pain isn't subsiding. You notice yourself breathing far faster than before." From 5d3f39b1ae9a64d567d2d8d850e76c3f61b4c0bf Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 13 Feb 2020 05:39:59 -0700 Subject: [PATCH 4/4] Update DNA.dm --- code/__DEFINES/DNA.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 9ebe6bb552..47184674d6 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -138,8 +138,8 @@ ////organ defines #define STANDARD_ORGAN_THRESHOLD 100 -#define STANDARD_ORGAN_HEALING (1/(15 MINUTES / 1 SECOND)) -#define STANDARD_ORGAN_DECAY (1/(15 MINUTES / 1 SECOND)) //designed to fail organs when left to decay for ~15 minutes. 1 SECOND is SSmobs tickrate. +#define STANDARD_ORGAN_HEALING (1/(15 MINUTES / 1 SECONDS)) +#define STANDARD_ORGAN_DECAY (1/(15 MINUTES / 1 SECONDS)) //designed to fail organs when left to decay for ~15 minutes. 1 SECOND is SSmobs tickrate. #define G_MALE 1 #define G_FEMALE 2