From a59ed8afc826118f885cf84cfcb5cdcd73a60026 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 16 Feb 2025 17:02:41 -0500 Subject: [PATCH] updates fat damage --- GainStation13/code/mechanics/fatness.dm | 4 ++++ code/__DEFINES/combat.dm | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm index c2d2ec4c33..916e102f91 100644 --- a/GainStation13/code/mechanics/fatness.dm +++ b/GainStation13/code/mechanics/fatness.dm @@ -274,6 +274,10 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/mainten return needed_fatness /mob/living/carbon/proc/applyFatnessDamage(amount) + if(!client?.prefs?.weight_gain_weapons) // If we can't fatten them through weapons, apply stamina damage + adjustStaminaLoss(amount) + return TRUE + var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * FAT_DAMAGE_TO_FATNESS) adjust_fatness(fat_to_add, FATTENING_TYPE_WEAPON) return fat_to_add diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 785c83c322..bd2d0844bd 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -279,5 +279,5 @@ #define FAT "fat" #define PERMA_FAT "perma_fat" /// What is the rate that one damage is converted to fatness? -#define FAT_DAMAGE_TO_FATNESS 4 -#define PERMA_FAT_DAMAGE_TO_FATNESS 4 +#define FAT_DAMAGE_TO_FATNESS 8 +#define PERMA_FAT_DAMAGE_TO_FATNESS 8