From 8b15518c7411d84bed5042a0d6bedb86a9141181 Mon Sep 17 00:00:00 2001 From: PowerfulAtom111 Date: Sat, 2 May 2026 14:56:42 -0500 Subject: [PATCH 1/6] sets MAX_LIVING_HEALTH back to 100 --- code/__DEFINES/mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index c26926d5af457e..b70b841db4c6c7 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -256,7 +256,7 @@ #define DIGITIGRADE_LEGS "Digitigrade Legs" // Health/damage defines -#define MAX_LIVING_HEALTH 150 //DOPPLER EDIT CHANGE - ORIGINAL: MAX_LIVING_HEALTH 100 +#define MAX_LIVING_HEALTH 100 //for determining which type of heartbeat sound is playing ///Heartbeat is beating fast for hard crit From a435914c162949e872d4ce59a2482a1e53a1f532 Mon Sep 17 00:00:00 2001 From: PowerfulAtom111 Date: Sat, 2 May 2026 15:00:21 -0500 Subject: [PATCH 2/6] removes human var overrides at the behest of Ephe --- modular_doppler/human_health_maximum/code/to_the_limit.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modular_doppler/human_health_maximum/code/to_the_limit.dm b/modular_doppler/human_health_maximum/code/to_the_limit.dm index 4f264aef77df10..ed3c541c52cfaa 100644 --- a/modular_doppler/human_health_maximum/code/to_the_limit.dm +++ b/modular_doppler/human_health_maximum/code/to_the_limit.dm @@ -1,7 +1,3 @@ -/mob/living/carbon/human - max_stamina = 170 - var/blood_volume_normal = BLOOD_VOLUME_NORMAL - /mob/living/silicon/robot maxHealth = MAX_LIVING_HEALTH health = MAX_LIVING_HEALTH From 74f5c4336d4a2244960e7a8f9e3af6eb50440d9b Mon Sep 17 00:00:00 2001 From: PowerfulAtom111 Date: Sat, 2 May 2026 15:03:48 -0500 Subject: [PATCH 3/6] Revert "removes human var overrides at the behest of Ephe" This reverts commit a435914c162949e872d4ce59a2482a1e53a1f532. --- modular_doppler/human_health_maximum/code/to_the_limit.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modular_doppler/human_health_maximum/code/to_the_limit.dm b/modular_doppler/human_health_maximum/code/to_the_limit.dm index ed3c541c52cfaa..4f264aef77df10 100644 --- a/modular_doppler/human_health_maximum/code/to_the_limit.dm +++ b/modular_doppler/human_health_maximum/code/to_the_limit.dm @@ -1,3 +1,7 @@ +/mob/living/carbon/human + max_stamina = 170 + var/blood_volume_normal = BLOOD_VOLUME_NORMAL + /mob/living/silicon/robot maxHealth = MAX_LIVING_HEALTH health = MAX_LIVING_HEALTH From c0c4e701f0e80a065c690a66e3602c15aa086860 Mon Sep 17 00:00:00 2001 From: PowerfulAtom111 Date: Sat, 2 May 2026 15:15:30 -0500 Subject: [PATCH 4/6] slight predickamint on the way to the oversized sto removes 2 lines in our Oversized code that were causing issues with the removal of the var define that wasn't doing anything, and themselves weren't actually doing anything either. --- modular_doppler/human_health_maximum/code/to_the_limit.dm | 4 ---- modular_doppler/modular_quirks/oversized/oversized.dm | 2 -- 2 files changed, 6 deletions(-) diff --git a/modular_doppler/human_health_maximum/code/to_the_limit.dm b/modular_doppler/human_health_maximum/code/to_the_limit.dm index 4f264aef77df10..ed3c541c52cfaa 100644 --- a/modular_doppler/human_health_maximum/code/to_the_limit.dm +++ b/modular_doppler/human_health_maximum/code/to_the_limit.dm @@ -1,7 +1,3 @@ -/mob/living/carbon/human - max_stamina = 170 - var/blood_volume_normal = BLOOD_VOLUME_NORMAL - /mob/living/silicon/robot maxHealth = MAX_LIVING_HEALTH health = MAX_LIVING_HEALTH diff --git a/modular_doppler/modular_quirks/oversized/oversized.dm b/modular_doppler/modular_quirks/oversized/oversized.dm index 34b2927e6f6a52..fb18eb6ab3631c 100644 --- a/modular_doppler/modular_quirks/oversized/oversized.dm +++ b/modular_doppler/modular_quirks/oversized/oversized.dm @@ -31,7 +31,6 @@ for(var/obj/item/bodypart/bodypart as anything in human_holder.bodyparts) on_gain_limb(src, bodypart, special = FALSE) - human_holder.blood_volume_normal = BLOOD_VOLUME_OVERSIZED human_holder.physiology.hunger_mod *= OVERSIZED_HUNGER_MOD //50% hungrier human_holder.add_movespeed_modifier(/datum/movespeed_modifier/oversized) @@ -83,7 +82,6 @@ UnregisterSignal(human_holder, COMSIG_CARBON_POST_ATTACH_LIMB) - human_holder.blood_volume_normal = BLOOD_VOLUME_NORMAL human_holder.physiology.hunger_mod /= OVERSIZED_HUNGER_MOD human_holder.remove_movespeed_modifier(/datum/movespeed_modifier/oversized) human_holder.remove_traits(oversized_traits, QUIRK_TRAIT) From 61dd5d666f00cc132c1e2dd3564e08e31075a765 Mon Sep 17 00:00:00 2001 From: PowerfulAtom111 Date: Tue, 12 May 2026 21:21:54 -0500 Subject: [PATCH 5/6] deletes to_the_limit.dm and human_health_maximum file --- modular_doppler/human_health_maximum/code/to_the_limit.dm | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 modular_doppler/human_health_maximum/code/to_the_limit.dm diff --git a/modular_doppler/human_health_maximum/code/to_the_limit.dm b/modular_doppler/human_health_maximum/code/to_the_limit.dm deleted file mode 100644 index ed3c541c52cfaa..00000000000000 --- a/modular_doppler/human_health_maximum/code/to_the_limit.dm +++ /dev/null @@ -1,3 +0,0 @@ -/mob/living/silicon/robot - maxHealth = MAX_LIVING_HEALTH - health = MAX_LIVING_HEALTH From c863c1a4cf6ace05a6d45bd71084bc45b33f649a Mon Sep 17 00:00:00 2001 From: PowerfulAtom111 Date: Tue, 12 May 2026 21:22:55 -0500 Subject: [PATCH 6/6] Update tgstation.dme forgot to remove it from DME as well --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 3c694e12115efb..2acb7bace47e91 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7060,7 +7060,6 @@ #include "modular_doppler\hearthkin\tribal_extended\code\weapons\sword.dm" #include "modular_doppler\height_scaling\code\icons.dm" #include "modular_doppler\height_scaling\code\preferences.dm" -#include "modular_doppler\human_health_maximum\code\to_the_limit.dm" #include "modular_doppler\icspawn\cconsultant_items.dm" #include "modular_doppler\icspawn\observer_spawn.dm" #include "modular_doppler\icspawn\spell.dm"