From e9383c784cf8f99d5877ac8bcbc75d1ab9e400a4 Mon Sep 17 00:00:00 2001 From: Kocma-san <112967882+Kocma-san@users.noreply.github.com> Date: Wed, 12 Mar 2025 16:42:56 +0700 Subject: [PATCH] Relocating the silly burn damage multiplier of xenomorph bodyparts (#89942) ## About The Pull Request Just moved the burn damage multiplier of bodyparts from `/obj/item/bodypart/proc/receive_damage()` to the `burn_modifier` variable. It makes more sense to me, because I recently spent too much time trying to figure out where that multiplier is located. ## Why It's Good For The Game It makes more sense ## Changelog :cl: code: The damage multiplier of xenomorph bodypart has been relocated /:cl: --- code/__DEFINES/bodyparts.dm | 1 + code/modules/surgery/bodyparts/_bodyparts.dm | 3 --- code/modules/surgery/bodyparts/head.dm | 2 ++ code/modules/surgery/bodyparts/parts.dm | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm index 03d2ad4f24b..8d60782f093 100644 --- a/code/__DEFINES/bodyparts.dm +++ b/code/__DEFINES/bodyparts.dm @@ -14,6 +14,7 @@ #define LIMB_MAX_HP_ALIEN_LARVA 50 //Used by the weird larva chest and head. Did you know they have those? #define LIMB_MAX_HP_ALIEN_LIMBS 100 //Used by xenomorph limbs. #define LIMB_MAX_HP_ALIEN_CORE 500 //Used by xenomorph chests and heads +#define LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER 2 //Used by xenomorphs and their larvae /// Limb Body Damage Coefficient /// A multiplication of the burn and brute damage that the limb's stored damage contributes to its attached mob's overall wellbeing. diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 032505a170d..e1d61d3f540 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -499,9 +499,6 @@ brute *= wound_damage_multiplier burn *= wound_damage_multiplier - if(bodytype & (BODYTYPE_ALIEN|BODYTYPE_LARVA_PLACEHOLDER)) //aliens take double burn //nothing can burn with so much snowflake code around - burn *= 2 - /* // START WOUND HANDLING */ diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 0f1a5203ea5..037fdca7f5b 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -236,6 +236,7 @@ px_y = 0 bodypart_flags = BODYPART_UNREMOVABLE max_damage = LIMB_MAX_HP_ALIEN_CORE + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER bodytype = BODYTYPE_ALIEN | BODYTYPE_ORGANIC bodyshape = BODYSHAPE_HUMANOID @@ -250,4 +251,5 @@ px_y = 0 bodypart_flags = BODYPART_UNREMOVABLE max_damage = LIMB_MAX_HP_ALIEN_LARVA + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER bodytype = BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_ORGANIC diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index a821eec9e62..b0866491e55 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -105,6 +105,7 @@ should_draw_greyscale = FALSE bodypart_flags = BODYPART_UNREMOVABLE max_damage = LIMB_MAX_HP_ALIEN_CORE + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER acceptable_bodyshape = BODYSHAPE_HUMANOID wing_types = null @@ -117,6 +118,7 @@ should_draw_greyscale = FALSE bodypart_flags = BODYPART_UNREMOVABLE max_damage = LIMB_MAX_HP_ALIEN_LARVA + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER bodytype = BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_ORGANIC acceptable_bodytype = BODYTYPE_LARVA_PLACEHOLDER wing_types = null @@ -281,6 +283,7 @@ bodypart_flags = BODYPART_UNREMOVABLE can_be_disabled = FALSE max_damage = LIMB_MAX_HP_ALIEN_LIMBS + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER should_draw_greyscale = FALSE appendage_noun = "scythe-like hand" @@ -379,6 +382,7 @@ bodypart_flags = BODYPART_UNREMOVABLE can_be_disabled = FALSE max_damage = LIMB_MAX_HP_ALIEN_LIMBS + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER should_draw_greyscale = FALSE appendage_noun = "scythe-like hand" @@ -513,6 +517,7 @@ bodypart_flags = BODYPART_UNREMOVABLE can_be_disabled = FALSE max_damage = LIMB_MAX_HP_ALIEN_LIMBS + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER should_draw_greyscale = FALSE /obj/item/bodypart/leg/right @@ -603,4 +608,5 @@ bodypart_flags = BODYPART_UNREMOVABLE can_be_disabled = FALSE max_damage = LIMB_MAX_HP_ALIEN_LIMBS + burn_modifier = LIMB_ALIEN_BURN_DAMAGE_MULTIPLIER should_draw_greyscale = FALSE