From 8bc303f5a680ae1ef3bb22260335d5f89a619aa8 Mon Sep 17 00:00:00 2001 From: Geeves Date: Fri, 15 May 2020 22:32:02 +0200 Subject: [PATCH] Scorched Earth (#8828) Doing enough fire damage to a corpse will now turn it into ash. --- code/modules/mob/living/carbon/human/death.dm | 4 ++-- code/modules/mob/living/carbon/human/human_damage.dm | 8 +++++--- html/changelogs/geeves-scorched_earth.yml | 6 ++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/geeves-scorched_earth.yml diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index c2e40183ae1..5ceb04bdafe 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -91,7 +91,7 @@ mutations.Add(HUSK) status_flags |= DISFIGURED //makes them unknown without fucking up other stuff like admintools - update_body(1) + update_body(TRUE) return /mob/living/carbon/human/proc/Drain() @@ -110,7 +110,7 @@ mutations.Add(SKELETON) status_flags |= DISFIGURED - update_body(0) + update_body(TRUE) return /mob/living/carbon/human/proc/vr_disconnect() diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 57a934b94b4..7241fe38c1a 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -10,9 +10,11 @@ health = maxHealth - getBrainLoss() - //TODO: fix husking - if(((maxHealth - getFireLoss()) < config.health_threshold_dead) && stat == DEAD) - ChangeToHusk() + if(stat == DEAD) + if(getFireLoss() > maxHealth * 1.5) + ChangeToHusk() + if(getFireLoss() > maxHealth * 3) + ChangeToSkeleton() UpdateDamageIcon() // to fix that darn overlay bug return diff --git a/html/changelogs/geeves-scorched_earth.yml b/html/changelogs/geeves-scorched_earth.yml new file mode 100644 index 00000000000..f13d1902d34 --- /dev/null +++ b/html/changelogs/geeves-scorched_earth.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Doing enough fire damage to a corpse will now turn it into a skeleton." \ No newline at end of file