From d47ceda5bbb04cd0c44b0e653afe0cc92ff92837 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Thu, 23 Feb 2023 06:03:44 -0800 Subject: [PATCH] Lava Damage Adjustment Lava instant damage halved. Lava increases flammability, fire type set to stack-managed to utilize chance of early extinguish. --- code/modules/mob/living/living_defense.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 296b50a7de..115840b8f8 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -473,11 +473,12 @@ to_chat(src, span("critical", "You've been struck by lightning!")) // Called when touching a lava tile. -// Does roughly 100 damage to unprotected mobs, and 20 to fully protected mobs. +// Does roughly 70 damage (30 instantly, up to ~40 over time) to unprotected mobs, and 10 to fully protected mobs. /mob/living/lava_act() - add_modifier(/datum/modifier/fire/intense, 8 SECONDS) // Around 40 total if left to burn and without fire protection per stack. - inflict_heat_damage(40) // Another 40, however this is instantly applied to unprotected mobs. - adjustFireLoss(20) // Lava cannot be 100% resisted with fire protection. + adjust_fire_stacks(1) + add_modifier(/datum/modifier/fire/stack_managed/intense, 8 SECONDS) // Around 40 total if left to burn and without fire protection per stack. + inflict_heat_damage(20) // Another 20, however this is instantly applied to unprotected mobs. + adjustFireLoss(10) // Lava cannot be 100% resisted with fire protection. /mob/living/proc/reagent_permeability() return 1