From 85f0b27efca18fb0d03eee41f8765e8e3cea756a Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sun, 21 Aug 2022 19:22:38 -0400 Subject: [PATCH] Fixes engraved component runtime on destroy() (#69323) ..() nulls the parent --- code/datums/components/engraved.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/components/engraved.dm b/code/datums/components/engraved.dm index d91be0efc90..9526e5bcad4 100644 --- a/code/datums/components/engraved.dm +++ b/code/datums/components/engraved.dm @@ -51,13 +51,15 @@ engraved_wall.update_appearance() /datum/component/engraved/Destroy(force, silent) - . = ..() + if(!parent) + return ..() parent.RemoveElement(/datum/element/art) //must be here to allow overlays to be updated UnregisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS) - if(parent && !QDELING(parent)) + if(!QDELING(parent)) var/atom/parent_atom = parent parent_atom.update_appearance() + return ..() //call this after since we null out the parent /datum/component/engraved/RegisterWithParent() RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)