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
+1 -1
View File
@@ -28,7 +28,7 @@
checkReagents()
/obj/effect/effect/foam/proc/post()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
sleep(30)
if(metal)
var/obj/structure/foamedmetal/M = new /obj/structure/foamedmetal(src.loc)
@@ -74,7 +74,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = "cigoff"
name = "burnt match"
desc = "A match. This one has seen better days."
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
//////////////////
//FINE SMOKABLES//
@@ -144,7 +144,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/turf/T = get_turf(src)
T.visible_message(flavor_text)
set_light(2, 0.25, "#E38F46")
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
/obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0)
var/turf/T = get_turf(src)
@@ -160,7 +160,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
M.update_inv_wear_mask(0)
M.update_inv_l_hand(0)
M.update_inv_r_hand(1)
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
qdel(src)
else
new /obj/effect/decal/cleanable/ash(T)
@@ -174,7 +174,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
M.update_inv_wear_mask(0)
M.update_inv_l_hand(0)
M.update_inv_r_hand(1)
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
/obj/item/clothing/mask/smokable/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
@@ -339,7 +339,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = icon_on
var/turf/T = get_turf(src)
T.visible_message(flavor_text)
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
if(ismob(loc))
var/mob/living/M = loc
M.update_inv_wear_mask(0)
@@ -352,7 +352,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 0
icon_state = icon_off
item_state = icon_off
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
else if (smoketime)
var/turf/location = get_turf(user)
user.visible_message("<span class='notice'>[user] empties out [src].</span>", "<span class='notice'>You empty out [src].</span>")
@@ -462,7 +462,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src], they however burn their finger in the process.</span>")
set_light(2)
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
else
lit = 0
icon_state = "[base_state]"
@@ -474,7 +474,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user.visible_message("<span class='notice'>[user] quietly shuts off the [src].</span>")
set_light(0)
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
else
return ..()
return
@@ -507,5 +507,5 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "[base_state]"
item_state = "[base_state]"
set_light(0)
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
return
@@ -72,7 +72,7 @@
playsound(get_turf(src), 'sound/weapons/empty.ogg', 25, 1)
return
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
active = 1
src.icon_state = "shield1"
stop_modifier()
@@ -91,7 +91,7 @@
playsound(src, 'sound/effects/phasein.ogg', 50, 1)
stop_modifier()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
/obj/item/weapon/cloaking_device/emp_act(severity)
deactivate()
@@ -35,7 +35,7 @@
/obj/item/weapon/flamethrower/process()
if(!lit)
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
return null
var/turf/location = loc
if(istype(location, /mob/))
@@ -145,7 +145,7 @@
if(!status) return
lit = !lit
if(lit)
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
if(href_list["amount"])
throw_amount = throw_amount + text2num(href_list["amount"])
throw_amount = max(50, min(5000, throw_amount))
@@ -52,7 +52,7 @@
var/obj/item/clothing/mask/smokable/cigarette/cig = W
if (cig.lit == 1)
src.visible_message("[user] crushes [cig] in \the [src], putting it out.")
processing_objects.Remove(cig)
STOP_PROCESSING(SSprocessing, cig)
var/obj/item/butt = new cig.type_butt(src)
cig.transfer_fingerprints_to(butt)
qdel(cig)
@@ -57,11 +57,11 @@
if(applies_material_colour)
color = material.icon_colour
if(material.products_need_process())
processing_objects |= src
START_PROCESSING(SSprocessing, src)
update_force()
/obj/item/weapon/material/Destroy()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/item/weapon/material/apply_hit_effect()
@@ -306,12 +306,12 @@
active = 1
armor_penetration = 20
/obj/item/weapon/melee/energy/blade/New()
processing_objects |= src
..()
/obj/item/weapon/melee/energy/blade/Initialize()
. = ..()
START_PROCESSING(SSprocessing, src)
/obj/item/weapon/melee/energy/blade/Destroy()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/item/weapon/melee/energy/blade/deactivate(mob/living/user)
@@ -722,7 +722,7 @@
W.lit = 1
W.damtype = "burn"
W.icon_state = "match_lit"
processing_objects.Add(W)
START_PROCESSING(SSprocessing, W)
W.update_icon()
return
+4 -4
View File
@@ -172,9 +172,9 @@
/obj/effect/energy_net/teleport
countdown = 60
/obj/effect/energy_net/New()
..()
processing_objects |= src
/obj/effect/energy_net/Initialize()
. = ..()
START_PROCESSING(SSprocessing, src)
/obj/effect/energy_net/Destroy()
@@ -184,7 +184,7 @@
M.captured = 0
M << "You are free of the net!"
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/effect/energy_net/proc/healthcheck()
+1 -1
View File
@@ -23,8 +23,8 @@
var/icon_species_in_hand = 0//If 1, we will use the species tag even for rendering this item in the left/right hand.
var/equip_slot = 0
/obj/Destroy()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
return ..()
+5 -5
View File
@@ -8,12 +8,12 @@
anchored = 1
var/progress = 0
/obj/structure/alien/egg/New()
..()
processing_objects += src
/obj/structure/alien/egg/Initialize()
. = ..()
START_PROCESSING(SSprocessing, src)
/obj/structure/alien/egg/Destroy()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/structure/alien/egg/CanUseTopic(var/mob/user)
@@ -32,7 +32,7 @@
for(var/mob/M in dead_mob_list)
if(istype(M,/mob/dead) && M.client && M.client.prefs && (MODE_XENOMORPH in M.client.prefs.be_special_role))
M << "[ghost_follow_link(src, M)] <span class='notice'>An alien is ready to hatch! (<a href='byond://?src=\ref[src];spawn=1'>spawn</a>)</span>"
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
update_icon()
/obj/structure/alien/egg/update_icon()
+4 -4
View File
@@ -5,12 +5,12 @@
health = 100
layer = 3.1
/obj/structure/alien/node/New()
..()
processing_objects += src
/obj/structure/alien/node/Initialize()
. = ..()
START_PROCESSING(SSprocessing, src)
/obj/structure/alien/node/Destroy()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/structure/alien/node/process()
@@ -77,7 +77,7 @@
if (timer <= 0)
dump_contents()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
qdel(src)
/obj/structure/closet/statue/dump_contents()
+2 -2
View File
@@ -36,11 +36,11 @@
else
opacity = 1
if(material.products_need_process())
processing_objects |= src
START_PROCESSING(SSprocessing, src)
update_nearby_tiles(need_rebuild=1)
/obj/structure/simple_door/Destroy()
processing_objects -= src
STOP_PROCESSING(SSprocessing, src)
update_nearby_tiles()
return ..()