Auto stash before cherry pick of "projectiles, artifact tweak"

Raeschen · Feb 23, 2024 · 0f30faa · 0f30faa
1 parent 974359f
commit 0f30faa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
@@ -28,6 +28,8 @@
 	var/area/A = get_area(src)
 	if(A)
 		UnregisterSignal(A, COMSIG_OBSERVER_APC)
+	if(circuit) //ChompEDIT START - qdel refs
+		QDEL_NULL(circuit) //ChompEDIT START - qdel refs
 	return ..()
 
 /obj/item/device/radio/intercom/custom

diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm
@@ -62,6 +62,13 @@
 	board_type = new /datum/frame/frame_types/intercom
 	matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
 
+
+/obj/item/weapon/circuitboard/intercom/Destroy()
+	if(istype(loc, /obj/item/device/radio/intercom))
+		var/obj/item/device/radio/intercom/my_machine = loc
+		my_machine.circuit = null
+	. = ..()
+
 /obj/item/weapon/circuitboard/keycard_auth
 	name = T_BOARD("keycard authenticator")
 	build_path = /obj/machinery/keycard_auth

diff --git a/code/modules/xenoarcheaology/artifacts/artifact.dm b/code/modules/xenoarcheaology/artifacts/artifact.dm
@@ -12,6 +12,13 @@
 
 	var/being_used = 0
 
+//ChompEDIT START - qdel refs
+/obj/machinery/artifact/Destroy()
+	if(artifact_master)
+		QDEL_NULL(artifact_master)
+	. = ..()
+//ChompEDIT END
+
 /obj/machinery/artifact/New()
 	..()