Silicon Deletion Sanity (#7800)

code/modules/mob/abstract/freelook/ai/eye.dm

@@ -44,8 +44,7 @@
 	if(!eyeobj) return
 	if(!new_eye)
 		new_eye = src
-	qdel(eyeobj) // No AI, no Eye
-	eyeobj = null
+	QDEL_NULL(eyeobj)
 	if(client)
 		client.eye = new_eye
 
@@ -60,10 +59,6 @@
 	. = ..()
 	create_eyeobj()
 
-/mob/living/silicon/ai/Destroy()
-	destroy_eyeobj()
-	. = ..()
-
 /atom/proc/move_camera_by_click()
 	if(istype(usr, /mob/living/silicon/ai))
 		var/mob/living/silicon/ai/AI = usr

code/modules/mob/living/silicon/ai/ai.dm

@@ -219,29 +219,15 @@ var/list/ai_verbs_default = list(
 	eyeobj.possess(src)
 
 /mob/living/silicon/ai/Destroy()
-	qdel(aiPDA)
-	qdel(aiMulti)
-	qdel(aiRadio)
-	aiPDA = null
-	aiMulti = null
-	aiRadio = null
-
+	QDEL_NULL(aiPDA)
+	QDEL_NULL(aiMulti)
+	QDEL_NULL(aiRadio)
 	ai_list -= src
-
-	qdel(eyeobj)
-	eyeobj = null
-
-	qdel(psupply)
-	psupply = null
-
-	qdel(aiMulti)
-	aiMulti = null
-
-	qdel(aiRadio)
-	aiRadio = null
-
-	qdel(aiCamera)
-	aiCamera = null
+	destroy_eyeobj()
+	QDEL_NULL(psupply)
+	QDEL_NULL(aiMulti)
+	QDEL_NULL(aiRadio)
+	QDEL_NULL(aiCamera)
 
 	return ..()
 

code/modules/mob/living/silicon/silicon.dm

@@ -47,6 +47,7 @@
 
 /mob/living/silicon/Destroy()
 	silicon_mob_list -= src
+	QDEL_NULL(idcard)
 	for(var/datum/alarm_handler/AH in SSalarm.all_handlers)
 		AH.unregister_alarm(src)
 	return ..()