From 7c3475e9211cc90db99cc88b18e5680bfa61ba17 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Sun, 29 Sep 2024 03:47:06 -0700 Subject: [PATCH] [MIRROR] sanity checks robot ID spawns (#9093) Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/game/objects/items/weapons/id cards/cards.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 91c5ba3a4b..000bfbbaf0 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -277,9 +277,10 @@ /obj/item/weapon/card/id/cargo/miner/borg/Initialize() . = ..() - R = loc.loc - registered_name = R.braintype - RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_loc)) + if(isrobot(loc?.loc)) + R = loc.loc + registered_name = R.braintype + RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_loc)) /obj/item/weapon/card/id/cargo/miner/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) if(old_loc == R || old_loc == R.module) @@ -294,7 +295,8 @@ hud_layerise() /obj/item/weapon/card/id/cargo/miner/borg/Destroy() - UnregisterSignal(src, COMSIG_OBSERVER_MOVED) - R = null - last_robot_loc = null + if(R) + UnregisterSignal(src, COMSIG_OBSERVER_MOVED) + R = null + last_robot_loc = null ..()