fix(welding): fixes inability to weld APCs

ChaoticOnyx · Mar 18, 2024 · 442607a · 442607a
1 parent f7ca53f
commit 442607a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
@@ -405,6 +405,9 @@
 	if(WT.use_tool(src, user, delay = 10 SECONDS, amount = 5))
 		return FALSE
 
+	if(QDELETED(src))
+		return FALSE
+
 	return TRUE
 
 /obj/machinery/camera/interact(mob/living/user as mob)

diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
@@ -580,8 +580,9 @@
 				"<span class='warning'>[src] has been cut from the wall by [user.name] with the weldingtool.</span>",\
 				"<span class='notice'>You cut the APC frame from the wall.</span>",\
 				"You hear welding.")
-			qdel(src)
-			return
+
+		qdel(src)
+		return
 	else if (istype(W, /obj/item/frame/apc) && opened && emagged)
 		emagged = 0
 		if (opened==2)