From faeb380a2e6ce375c8af4d37ff9ad740fc2439eb Mon Sep 17 00:00:00 2001 From: Kylerace Date: Sun, 11 Jul 2021 23:18:51 -0700 Subject: [PATCH] fixes hard del with objects created from holodeck spawners (#60140) turns out mobs spawned from holodeck spawners dont get registered for qdeletion, now they do. hard dels btfo hard dels are poo poo and holodeck issues are definitely 100x worse --- code/modules/holodeck/computer.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 7709e9540ef..32e1ecfc112 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -253,8 +253,12 @@ and clear when youre done! if you dont i will use :newspaper2: on you effects += holo_effect spawned -= holo_effect var/atom/holo_effect_product = holo_effect.activate(src)//change name - if(istype(holo_effect_product) || islist(holo_effect_product)) + if(istype(holo_effect_product)) spawned += holo_effect_product // we want mobs or objects spawned via holoeffects to be tracked as objects + RegisterSignal(holo_effect_product, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists) + if(islist(holo_effect_product)) + for(var/atom/atom_product as anything in holo_effect_product) + RegisterSignal(atom_product, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists) continue if(isobj(holo_atom))