From 756b012ce104ca5edc56c4740703daabc7a581e8 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 29 Sep 2024 08:29:31 +0200
Subject: [PATCH] actually do it properly

---
 code/game/objects/items/weapons/id cards/cards.dm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm
index ed1642f6722..000bfbbaf0f 100644
--- a/code/game/objects/items/weapons/id cards/cards.dm	
+++ b/code/game/objects/items/weapons/id cards/cards.dm	
@@ -277,11 +277,10 @@
 
 /obj/item/weapon/card/id/cargo/miner/borg/Initialize()
 	. = ..()
-	if(loc)
+	if(isrobot(loc?.loc))
 		R = loc.loc
-		if(istype(R))
-			registered_name = R.braintype
-			RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_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)
@@ -296,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
 	..()