This commit is contained in:
kevinz000
2018-10-14 20:03:17 -07:00
parent 67cf6cad0c
commit 2c0898f870
93 changed files with 204 additions and 204 deletions
+4 -4
View File
@@ -159,14 +159,14 @@
if(burning)
burning = FALSE
update_icon()
processing_objects -= src
STOP_PROCESSING(SSobj, src)
visible_message("<span class='notice'>\The [src] stops burning.</span>")
/obj/structure/bonfire/proc/ignite()
if(!burning && get_fuel_amount())
burning = TRUE
update_icon()
processing_objects += src
START_PROCESSING(SSobj, src)
visible_message("<span class='warning'>\The [src] starts burning!</span>")
/obj/structure/bonfire/proc/burn()
@@ -342,14 +342,14 @@
if(burning)
burning = FALSE
update_icon()
processing_objects -= src
STOP_PROCESSING(SSobj, src)
visible_message("<span class='notice'>\The [src] stops burning.</span>")
/obj/structure/fireplace/proc/ignite()
if(!burning && get_fuel_amount())
burning = TRUE
update_icon()
processing_objects += src
START_PROCESSING(SSobj, src)
visible_message("<span class='warning'>\The [src] starts burning!</span>")
/obj/structure/fireplace/proc/burn()
@@ -43,7 +43,7 @@
qdel(src)
return
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
..()
/obj/structure/closet/statue/process()
@@ -55,7 +55,7 @@
M.setOxyLoss(intialOxy)
if (timer <= 0)
dump_contents()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
qdel(src)
/obj/structure/closet/statue/dump_contents()
+4 -4
View File
@@ -25,12 +25,12 @@
/obj/structure/girder/Destroy()
if(girder_material.products_need_process())
processing_objects -= src
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/structure/girder/process()
if(!radiate())
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return
/obj/structure/girder/proc/radiate()
@@ -53,9 +53,9 @@
if(applies_material_colour)
color = girder_material.icon_colour
if(girder_material.products_need_process()) //Am I radioactive or some other? Process me!
processing_objects |= src
START_PROCESSING(SSobj, src)
else if(src in processing_objects) //If I happened to be radioactive or s.o. previously, and am not now, stop processing.
processing_objects -= src
STOP_PROCESSING(SSobj, src)
/obj/structure/girder/get_material()
return girder_material
+2 -2
View File
@@ -22,7 +22,7 @@
/obj/structure/prop/nest/initialize()
..()
den_mobs = list()
processing_objects |= src
START_PROCESSING(SSobj, src)
last_spawn = world.time
if(randomize_spawning) //Not the biggest shift in spawntime, but it's here.
var/delayshift_clamp = spawn_delay / 10
@@ -31,7 +31,7 @@
/obj/structure/prop/nest/Destroy()
den_mobs = null
processing_objects -= src
STOP_PROCESSING(SSobj, src)
..()
/obj/structure/prop/nest/attack_hand(mob/living/user) // Used to tell the player that this isn't useful for anything.
+1 -1
View File
@@ -36,7 +36,7 @@
else
set_opacity(1)
if(material.products_need_process())
processing_objects |= src
START_PROCESSING(SSobj, src)
update_nearby_tiles(need_rebuild=1)
/obj/structure/simple_door/Destroy()