cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kill processing_objects (#3398)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenoarchaeology/finds/finds_special.dm
+7 -7
View File
@@ -66,11 +66,11 @@
/obj/item/weapon/vampiric/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
listening_objects += src
/obj/item/weapon/vampiric/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
listening_objects -= src
return ..()
@@ -159,11 +159,11 @@
/obj/effect/decal/cleanable/blood/splatter/animated/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
loc_last_process = src.loc
/obj/effect/decal/cleanable/blood/splatter/animated/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/effect/decal/cleanable/blood/splatter/animated/process()
@@ -193,10 +193,10 @@
density = 1
/obj/effect/shadow_wight/New()
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
/obj/effect/shadow_wight/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/effect/shadow_wight/process()
@@ -221,7 +221,7 @@
M.sleeping = max(M.sleeping,rand(5,10))
src.loc = null
else
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
/obj/effect/shadow_wight/Bump(var/atom/obstacle)
obstacle << "<span class='warning'>You feel a chill run down your spine!</span>"
code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
+2 -2
View File
@@ -20,11 +20,11 @@
/datum/talking_atom/proc/init()
if(holder_atom)
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
/datum/talking_atom/process()
if(!holder_atom)
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
else if(heard_words.len >= 1 && world.time > last_talk_time + talk_interval && prob(talk_chance))
SaySomething()
code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+2 -2
View File
@@ -35,7 +35,7 @@
/obj/item/weapon/anodevice/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSprocessing, src)
/obj/item/weapon/anodevice/attackby(var/obj/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/weapon/anobattery))
@@ -191,7 +191,7 @@
icon_state = "anodev[round(p,25)]"
/obj/item/weapon/anodevice/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/item/weapon/anodevice/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
code/modules/research/xenoarchaeology/tools/tools_locater.dm
+5 -5
View File
@@ -12,12 +12,12 @@
var/scan_ticks = 0
var/obj/item/device/radio/target_radio
/obj/item/device/beacon_locator/New()
..()
processing_objects.Add(src)
/obj/item/device/beacon_locator/Initialize()
. = ..()
START_PROCESSING(SSprocessing, src)
/obj/item/device/beacon_locator/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSprocessing, src)
return ..()
/obj/item/device/beacon_locator/process()
@@ -39,7 +39,7 @@
if(prob(scan_ticks * 10))
spawn(0)
set background = 1
if(processing_objects.Find(src))
if(isprocessing)
//scan radios in the world to try and find one
var/cur_dist = 999
for(var/obj/item/device/radio/beacon/R in world)