Merge pull request #4682 from VOREStation/upstream-merge-5829

[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
This commit is contained in:
Novacat
2019-03-27 16:37:45 -04:00
committed by GitHub
90 changed files with 2251 additions and 1709 deletions
+1 -1
View File
@@ -54,7 +54,7 @@
color = girder_material.icon_colour
if(girder_material.products_need_process()) //Am I radioactive or some other? Process me!
START_PROCESSING(SSobj, src)
else if(is_processing) //If I happened to be radioactive or s.o. previously, and am not now, stop processing.
else if(datum_flags & DF_ISPROCESSING) //If I happened to be radioactive or s.o. previously, and am not now, stop processing.
STOP_PROCESSING(SSobj, src)
/obj/structure/girder/get_material()