Kill processing_objects (#3398)

This commit is contained in:
Lohikar
2017-09-09 15:22:58 -05:00
committed by GitHub
parent 16d33365c2
commit 8f4b4effae
41 changed files with 89 additions and 130 deletions
+4 -4
View File
@@ -34,7 +34,7 @@
update_name()
/obj/item/weapon/reagent_containers/glass/rag/Destroy()
processing_objects -= src //so we don't continue turning to ash while gc'd
STOP_PROCESSING(SSprocessing, src) //so we don't continue turning to ash while gc'd
return ..()
/obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob)
@@ -178,14 +178,14 @@
qdel(src)
return
processing_objects += src
START_PROCESSING(SSprocessing, src)
set_light(2, null, "#E38F46")
on_fire = 1
update_name()
update_icon()
/obj/item/weapon/reagent_containers/glass/rag/proc/extinguish()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
set_light(0)
on_fire = 0
@@ -212,7 +212,7 @@
location.hotspot_expose(700, 5)
if(burn_time <= 0)
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
new /obj/effect/decal/cleanable/ash(location)
qdel(src)
return
+2 -2
View File
@@ -19,12 +19,12 @@
on = !on
if(on)
set_light(range, 2, "#7700dd")
processing_objects |= src
START_PROCESSING(SSprocessing, src)
icon_state = "uv_on"
else
set_light(0)
clear_last_scan()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
icon_state = "uv_off"
/obj/item/device/uv_light/proc/clear_last_scan()