From 8dd67afb9c40bfd9b191dda01066acf8ab1eb06a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 24 Dec 2019 23:43:16 -0800 Subject: [PATCH 1/2] Update pai_defense.dm --- code/modules/mob/living/silicon/pai/pai_defense.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index dda8ddfebd..0a2c129790 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -60,10 +60,11 @@ return FALSE //No we're not flammable /mob/living/silicon/pai/proc/take_holo_damage(amount) - emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth) - if(emitterhealth < 0) - fold_in(force = TRUE) - to_chat(src, "The impact degrades your holochassis!") + if(amount > 0) + emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth) + if(emitterhealth < 0) + fold_in(force = TRUE) + to_chat(src, "The impact degrades your holochassis!") return amount /mob/living/silicon/pai/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE) From 139d4b4b3a0d29eaaf402b5b8b7529c675c2dd7a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 27 Dec 2019 18:44:46 -0800 Subject: [PATCH 2/2] ehh fine but why would you use this proc for that --- code/modules/mob/living/silicon/pai/pai_defense.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index 0a2c129790..dfc718f1ab 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -60,10 +60,10 @@ return FALSE //No we're not flammable /mob/living/silicon/pai/proc/take_holo_damage(amount) + emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth) + if(emitterhealth < 0) + fold_in(force = TRUE) if(amount > 0) - emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth) - if(emitterhealth < 0) - fold_in(force = TRUE) to_chat(src, "The impact degrades your holochassis!") return amount