Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286

[MIRROR] ismachinery define
2017-10-05 08:32:10 -04:00
parent 20f88b815a dfc1a9bdfc
commit 29aafaf42d
9 changed files with 14 additions and 12 deletions
@@ -51,7 +51,7 @@
 			T.add_blueprints_preround(src)

 /obj/Destroy(force=FALSE)
-	if(!istype(src, /obj/machinery))
+	if(!ismachinery(src))
 		STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
 	SStgui.close_uis(src)
 	. = ..()