From 5cb1b0c95f3b6a028095d773da512c0c127ff928 Mon Sep 17 00:00:00 2001 From: Putnam Date: Thu, 11 Apr 2019 10:27:43 -0700 Subject: [PATCH 1/2] Makes preternis not lose charge when dead. --- .../living/carbon/human/species_types/preternis/preternis.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 804cf556940f..3dc83227f0ac 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -144,6 +144,8 @@ adjust_charge - take a positive or negative value to adjust the charge level /datum/species/preternis/spec_life(mob/living/carbon/human/H) . = ..() + if(H.stat == DEAD) + return handle_charge(H) /datum/species/preternis/proc/handle_charge(mob/living/carbon/human/H) From 2426bdf74e9bd71dd91336ee5868e2cd4bba598f Mon Sep 17 00:00:00 2001 From: Putnam Date: Thu, 11 Apr 2019 10:28:28 -0700 Subject: [PATCH 2/2] Make ethereals also not lose charge when dead. --- code/modules/mob/living/carbon/human/species_types/ethereal.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 952b84737231..b63614af8dde 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -88,6 +88,8 @@ /datum/species/ethereal/spec_life(mob/living/carbon/human/H) .=..() + if(H.stat == DEAD) + return handle_charge(H) /datum/species/ethereal/spec_fully_heal(mob/living/carbon/human/H)