From 8a6fc43738f54cf083e714051b99952bcd8bda05 Mon Sep 17 00:00:00 2001 From: Timberpoes Date: Wed, 16 Sep 2020 00:19:40 +0100 Subject: [PATCH] Fix persistent scarring runtime (#53719) If statement requiring a non-null var would explicitly run when that var was null. Added early continue to skip over it in that scenario. --- code/controllers/subsystem/persistence.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index bd389a2112f..09519db8f4a 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -401,7 +401,11 @@ SUBSYSTEM_DEF(persistence) continue var/mob/living/carbon/human/original_human = ending_human.mind.original_character - if(!original_human || original_human.stat == DEAD || !original_human.all_scars || !(original_human == ending_human)) + + if(!original_human) + continue + + if(original_human.stat == DEAD || !original_human.all_scars || !(original_human == ending_human)) original_human.save_persistent_scars(TRUE) else original_human.save_persistent_scars()