From f0812396137f2962f7c58b39401396f690880abf Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 15 Jul 2018 23:00:48 -0700 Subject: [PATCH 1/2] Update damage_procs.dm --- .../code/modules/mob/living/carbon/damage_procs.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm index 208d4769bb..e7ed04c375 100644 --- a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm +++ b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm @@ -8,3 +8,13 @@ stambufferregentime = world.time + 2 SECONDS if(updating_stamina) update_health_hud() + +/mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE) + if(!forced && (status_flags & GODMODE)) + return FALSE + amount = CLAMP(amount, 0, 200 - getStaminaLoss()) + if(amount > 0) + take_overall_damage(0, 0, amount, updating_health) + else + heal_overall_damage(0, 0, abs(amount), FALSE, FALSE, updating_health) + return amount From e3d7ce97936320cdf314af04ea1deacee4c0464e Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 16 Jul 2018 01:50:33 -0700 Subject: [PATCH 2/2] Update damage_procs.dm --- modular_citadel/code/modules/mob/living/carbon/damage_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm index e7ed04c375..8f1d0baff1 100644 --- a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm +++ b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm @@ -12,8 +12,8 @@ /mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE) if(!forced && (status_flags & GODMODE)) return FALSE - amount = CLAMP(amount, 0, 200 - getStaminaLoss()) if(amount > 0) + amount = CLAMP(amount, 0, 200 - getStaminaLoss()) take_overall_damage(0, 0, amount, updating_health) else heal_overall_damage(0, 0, abs(amount), FALSE, FALSE, updating_health)