From b2950a66880c25e1d2af5fe14c728122ba9c746e Mon Sep 17 00:00:00 2001 From: Roxy <94389951+SapphoQueer@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:02:53 +0200 Subject: [PATCH] Reverts us back to 100 maxhp from the 135 we have been on because I lived to it once (#4479) ## About The Pull Request cyborgs, synths, humans, all that? Yeah, we 100hp now. No more 135. do not merge until the bloodsucker nerfs and blacksmithing nerfs are here so they don't become WAY beyond powerful ## Why It's Good For The Game The vast majority of content we get is made with 100hp in mind, there are a very limited amount of features which are made with more in mind (bloodsucker, blacksmithing). The skyrat guns are already being removed, which was one of the main factors on not lowering it. However, batons, lasers, and even most other crew melee weapons are impacted by this. Antagonist weapons are in turn affected far less. The higher damage something does, the less extra hits they'll have to do in order to hit that same treshold. Some antagonist weapons will require 1 less hit to crit, but most crew weapons will require 2 (or more) less hits to crit. Antagonists _ALSO_ routinely get some of the best armor in the game. The extra HP scales extra hard with them due to this, allowing an otherwise settled fight to be enough for the antagonist to retreat. Lasers will once more feel punchy, and in general fights will feel less like they drag on forever. Other consequences of this change will be things like batons stamcritting in 2 hits instead of 3, and the syndicate revolver being Good Again. (3 shots to crit is a lot more than 2 when you only get 6 shots for 13tc) tl;dr everything we get from tg is balanced around the 100 threshold, having more than that fundamentally screws things up, except for the like- 3 features that are made around 135. One of which is being removed, the others are being toned down by other players. ## Proof Of Testing I did test it and the health do be 100 again
Screenshots/Videos image image image image
## Changelog :cl: balance: Reverts human health to 100hp balance: Reverts sillicon health to 100hp /:cl: --------- Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/__DEFINES/bodyparts.dm | 4 ++-- code/__DEFINES/~~bubber_defines/mobs.dm | 4 +--- .../antagonists/heretic/knowledge/flesh_lore.dm | 6 +++--- .../mob/living/silicon/robot/robot_defines.dm | 4 ++-- .../modules/projectiles/guns/energy/beam_rifle.dm | 2 +- .../primitive_cooking_additions/code/millstone.dm | 2 +- tgui/packages/tgui/interfaces/CrewConsoleBubbers.tsx | 12 ++++++------ 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm index 4384e25a1a7..e99cacee0fb 100644 --- a/code/__DEFINES/bodyparts.dm +++ b/code/__DEFINES/bodyparts.dm @@ -6,9 +6,9 @@ /// The max damage a limb can take before it stops taking damage. /// Used by the max_damage var. #define LIMB_MAX_HP_PROSTHESIS 20 //Used by surplus prosthesis limbs. -#define LIMB_MAX_HP_DEFAULT 60 //Used by most all limbs by default. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_DEFAULT 50 +#define LIMB_MAX_HP_DEFAULT 50 //Used by most all limbs by default. #define LIMB_MAX_HP_ADVANCED 75 //Used by advanced robotic limbs. -#define LIMB_MAX_HP_CORE 250 //Only use this for heads and torsos. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_CORE 200 +#define LIMB_MAX_HP_CORE 200 //Only use this for heads and torsos. /// Xenomorph Limbs #define LIMB_MAX_HP_ALIEN_LARVA 50 //Used by the weird larva chest and head. Did you know they have those? diff --git a/code/__DEFINES/~~bubber_defines/mobs.dm b/code/__DEFINES/~~bubber_defines/mobs.dm index 655d7125807..a5cd7f2e467 100644 --- a/code/__DEFINES/~~bubber_defines/mobs.dm +++ b/code/__DEFINES/~~bubber_defines/mobs.dm @@ -2,9 +2,7 @@ #define PULL_OVERSIZED_SLOWDOWN 2 -#define HUMAN_HEALTH_MODIFIER 1.35 - -#define HUMAN_MAXHEALTH MAX_LIVING_HEALTH * HUMAN_HEALTH_MODIFIER +#define HUMAN_MAXHEALTH MAX_LIVING_HEALTH #define UNDERWEAR_HIDE_SOCKS (1<<0) #define UNDERWEAR_HIDE_SHIRT (1<<1) diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm index 15a291f618e..b9503f33f9c 100644 --- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm @@ -1,7 +1,7 @@ /// The max amount of health a ghoul has. -#define GHOUL_MAX_HEALTH HUMAN_MAXHEALTH - 35 // BUBBER EDIT +#define GHOUL_MAX_HEALTH HUMAN_MAXHEALTH - 30 // BUBBER EDIT - 70 because we're going back to 100hp /// The max amount of health a voiceless dead has. -#define MUTE_MAX_HEALTH HUMAN_MAXHEALTH // BUBBER EDIT +#define MUTE_MAX_HEALTH HUMAN_MAXHEALTH // BUBBER EDIT - I mean i guess this'll keep it at 100hp so I don't need to change it /datum/heretic_knowledge_tree_column/main/flesh neighbour_type_left = /datum/heretic_knowledge_tree_column/lock_to_flesh @@ -119,7 +119,7 @@ // BUBBER CHANGE BELOW - GHOUL MAXHP desc = "Allows you to transmute a corpse and a poppy to create a Voiceless Dead. \ The corpse does not need to have a soul. \ - Voiceless Dead are mute ghouls and have 135 health, but can use Bloody Blades effectively. \ + Voiceless Dead are mute ghouls and have 100 health, but can use Bloody Blades effectively. \ You can only create two at a time." gain_text = "I found notes of a dark ritual, unfinished... yet still, I pushed forward." required_atoms = list( diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index 7f4f7e68ae1..3a2ef37f720 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -9,8 +9,8 @@ real_name = "Cyborg" icon = 'icons/mob/silicon/robots.dmi' //SKYRAT EDIT - Modified in modular_skyrat\modules\altborgs\code\robot_defines.dm (to allow for custom transformation animations) icon_state = "robot" - maxHealth = 135 // Bubber Edit - health = 135 // Bubber Edit + maxHealth = 100 + health = 100 bubble_icon = "robot" designation = "Default" //used for displaying the prefix & getting the current model of cyborg has_limbs = TRUE diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm index c60c9983578..22dab265a49 100644 --- a/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm @@ -5,7 +5,7 @@ Might cause unexpected spaggetification" /obj/projectile/beam/event_horizon - damage = HUMAN_HEALTH_MODIFIER * 100 + damage = HUMAN_MAXHEALTH damage_type = BRUTE armor_flag = ENERGY range = 150 diff --git a/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm b/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm index 505d418b536..c2949f49531 100644 --- a/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm +++ b/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm @@ -1,5 +1,5 @@ #define MILLSTONE_STAMINA_MINIMUM 50 //What is the amount of stam damage that we prevent mill use at -#define MILLSTONE_STAMINA_USE 100 //How much stam damage is given to people when the mill is used +#define MILLSTONE_STAMINA_USE 80 //How much stam damage is given to people when the mill is used /obj/structure/millstone name = "millstone" diff --git a/tgui/packages/tgui/interfaces/CrewConsoleBubbers.tsx b/tgui/packages/tgui/interfaces/CrewConsoleBubbers.tsx index 23624f0c2dd..eccd72a0102 100644 --- a/tgui/packages/tgui/interfaces/CrewConsoleBubbers.tsx +++ b/tgui/packages/tgui/interfaces/CrewConsoleBubbers.tsx @@ -91,12 +91,12 @@ const areaSort = (a: CrewSensor, b: CrewSensor) => { }; const getHealthLevel = (healthSum: number): number => { - if (healthSum <= 74) return 0; - if (healthSum <= 95) return 1; - if (healthSum <= 116) return 2; - if (healthSum <= 137) return 3; - if (healthSum <= 158) return 4; - return 5; // over 158 (near crit) + if (healthSum <= 56) return 0; + if (healthSum <= 72) return 1; + if (healthSum <= 85) return 2; + if (healthSum <= 100) return 3; + if (healthSum <= 115) return 4; + return 5; // over 116 (near crit) }; const healthToAttribute = (