diff --git a/code/__DEFINES/~~bubber_defines/combat.dm b/code/__DEFINES/~~bubber_defines/combat.dm index 1553bfce8de..8430f889bd1 100644 --- a/code/__DEFINES/~~bubber_defines/combat.dm +++ b/code/__DEFINES/~~bubber_defines/combat.dm @@ -2,3 +2,6 @@ #define JOULES_PER_DAMAGE (30 KILO JOULES) /// Calculates the amount of burn force when applying this much energy to a mob via electrocution from an energy source. #define ELECTROCUTE_DAMAGE(energy) (energy >= 1 KILO JOULES ? clamp(round(energy / JOULES_PER_DAMAGE) + rand(-5,5), 10, (HUMAN_MAXHEALTH-10)) : 0) + +/// Health buff for having the oversized quirk. +#define OVERSIZED_HEALTH_BUFF 1.4 diff --git a/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm b/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm index 0c69761e905..d6f8c7a9768 100644 --- a/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm +++ b/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm @@ -20,6 +20,8 @@ human_holder.maptext_height = 32 * human_holder.dna.features["body_size"] //Adjust runechat height human_holder.dna.update_body_size() human_holder.mob_size = MOB_SIZE_LARGE + human_holder.maxHealth = HUMAN_MAXHEALTH * OVERSIZED_HEALTH_BUFF + human_holder.health += ((HUMAN_MAXHEALTH * OVERSIZED_HEALTH_BUFF) - HUMAN_MAXHEALTH) RegisterSignal(human_holder, COMSIG_CARBON_POST_ATTACH_LIMB, PROC_REF(on_gain_limb)) // make sure we handle this when new ones are applied @@ -50,6 +52,8 @@ human_holder.maptext_height = 32 * human_holder.dna.features["body_size"] human_holder.dna.update_body_size() human_holder.mob_size = MOB_SIZE_HUMAN + human_holder.maxHealth = HUMAN_MAXHEALTH + human_holder.health -= ((HUMAN_MAXHEALTH * OVERSIZED_HEALTH_BUFF) - HUMAN_MAXHEALTH) var/obj/item/bodypart/arm/left/left_arm = human_holder.get_bodypart(BODY_ZONE_L_ARM) if(left_arm)