From 2125c98f7f492d2bafcc1f6541c2cc041151f965 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:25:45 -0600 Subject: [PATCH] Xenos no longer have capped damage (#7619) # About the pull request This PR fixes an oversight where `/mob/living/proc/adjustBruteLoss` and `/mob/living/proc/adjustFireLoss` caps brute/fire damage at 2x max health, but warding changes their effective max health resulting in edge cases where the xenomorph is immortal (though forever in crit). Now xenos do not cap their brute or fire damage. # Explain why it's good for the game Fixes #7082 # Testing Photographs and Procedure
Screenshots & Videos https://youtu.be/I2h1qd5sN8I
# Changelog :cl: Drathek fix: Fixed xenos sometimes becoming immortal with warding pheros (xenos do not cap brute/fire damage now) /:cl: --- code/modules/mob/living/carbon/xenomorph/life.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index d7d86ebfbb4c..eb00dbaa8ac2 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -514,6 +514,16 @@ Make sure their actual health updates immediately.*/ set_stat(UNCONSCIOUS) SEND_SIGNAL(src, COMSIG_XENO_ENTER_CRIT) +/mob/living/carbon/xenomorph/adjustBruteLoss(amount) + if(status_flags & GODMODE) + return //godmode + bruteloss = max(bruteloss + amount, 0) + +/mob/living/carbon/xenomorph/adjustFireLoss(amount) + if(status_flags & GODMODE) + return //godmode + fireloss = max(fireloss + amount, 0) + /mob/living/carbon/xenomorph/set_stat(new_stat) . = ..() // Temporarily force triggering HUD updates so they apply immediately rather than on Life tick.