Merge pull request #31286 from KorPhaeron/ismachinery

ismachinery define
This commit is contained in:
Leo
2017-10-04 21:25:31 -03:00
committed by CitadelStationBot
parent 2d27df3adc
commit 39cf9bb7a0
9 changed files with 14 additions and 12 deletions
+1 -1
View File
@@ -85,7 +85,7 @@
src.grille += 1
else if(istype(O, /obj/machinery/door))
src.door += 1
else if(istype(O, /obj/machinery))
else if(ismachinery(O))
src.mach += 1
if(count_territories)
+1 -1
View File
@@ -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)
. = ..()