cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kills off Object and Fast Object Processes

Browse Source
This commit is contained in:
Fox McCloud
2019-04-23 23:53:40 -04:00
parent 1544756ce6
commit 0034e851a1
126 changed files with 350 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/alarm/alarm.dm
+1 -1
View File
@@ -29,7 +29,7 @@
cameras() // Sets up both cameras and last alarm area.
set_source_data(source, duration, severity)
/datum/alarm/proc/process()
/datum/alarm/process()
// Has origin gone missing?
if(!origin && !end_time)
end_time = world.time + ALARM_RESET_DELAY
code/modules/alarm/alarm_handler.dm
+1 -1
View File
@@ -7,7 +7,7 @@
var/list/datum/alarm/alarms_assoc = new // Associative list of alarms, to efficiently acquire them based on origin.
var/list/listeners = new // A list of all objects interested in alarm changes.
/datum/alarm_handler/proc/process()
/datum/alarm_handler/process()
for(var/datum/alarm/A in alarms)
A.process()
check_alarm_cleared(A)
code/modules/assembly/assembly.dm
+1 -1
View File
@@ -125,7 +125,7 @@
..()
/obj/item/assembly/process()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
/obj/item/assembly/examine(mob/user)
..()
code/modules/assembly/health.dm
+4 -4
View File
@@ -21,10 +21,10 @@
/obj/item/assembly/health/toggle_secure()
secured = !secured
if(secured && scanning)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
scanning = FALSE
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
@@ -66,9 +66,9 @@
return FALSE
scanning = !scanning
if(scanning)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return
/obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy
code/modules/assembly/infrared.dm
+2 -2
View File
@@ -42,12 +42,12 @@
/obj/item/assembly/infra/toggle_secure()
secured = !secured
if(secured)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
on = FALSE
if(first)
qdel(first)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
code/modules/assembly/proximity.dm
+2 -2
View File
@@ -28,11 +28,11 @@
/obj/item/assembly/prox_sensor/toggle_secure()
secured = !secured
if(secured)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
scanning = 0
timing = 0
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
code/modules/assembly/timer.dm
+2 -2
View File
@@ -29,10 +29,10 @@
/obj/item/assembly/timer/toggle_secure()
secured = !secured
if(secured)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
timing = FALSE
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
code/modules/atmos_automation/statements.dm
+1 -1
View File
@@ -29,7 +29,7 @@ var/global/automation_types = subtypesof(/datum/automation)
/datum/automation/proc/OnRemove()
return
/datum/automation/proc/process()
/datum/automation/process()
return
/datum/automation/proc/Evaluate()
code/modules/awaymissions/snpc.dm
+2 -2
View File
@@ -47,7 +47,7 @@
var/list/squad
/obj/effect/spawner/snpc_squad/New()
processing_objects += src
START_PROCESSING(SSobj, src)
squad = squads[squad_type]
if(!squad)
@@ -57,7 +57,7 @@
/obj/effect/spawner/snpc_squad/Destroy()
squad = null
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return ..()
/obj/effect/spawner/snpc_squad/process()
code/modules/awaymissions/zvis.dm
+2 -2
View File
@@ -58,11 +58,11 @@
owner = o
if(args.len >= 3)
params = args.Copy(3)
processing_objects += src
START_PROCESSING(SSobj, src)
trigger()
/obj/effect/portal_sensor/Destroy()
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return ..()
/obj/effect/portal_sensor/Crossed(A)
code/modules/busy_space/air_traffic.dm
+1 -1
View File
@@ -17,7 +17,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
next_message = world.time + rand(delay_min, delay_max)
process()
/datum/lore/atc_controller/proc/process()
/datum/lore/atc_controller/process()
if(world.time >= next_message)
if(squelched)
next_message = world.time + backoff_delay
code/modules/clothing/head/misc_special.dm
+2 -2
View File
@@ -94,7 +94,7 @@
/obj/item/clothing/head/cakehat/process()
if(!onfire)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return
var/turf/location = src.loc
@@ -113,7 +113,7 @@
src.force = 3
src.damtype = "fire"
src.icon_state = "cake1"
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
src.force = null
src.damtype = "brute"
code/modules/clothing/spacesuits/chronosuit.dm
+2 -2
View File
@@ -122,7 +122,7 @@
else
new_camera(user)
else
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
/obj/item/clothing/suit/space/chronos/proc/activate()
if(!activating && !activated && !teleporting)
@@ -143,7 +143,7 @@
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Starting ui display driver")
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Initializing chronowalk4-view")
new_camera(user)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
activated = 1
else
to_chat(user, "\[ <span style='color: #ff0000;'>fail</span> \] Mounting /dev/helmet")
code/modules/clothing/spacesuits/hardsuit.dm
+3 -3
View File
@@ -633,7 +633,7 @@
owner.visible_message("<span class='danger'>[owner]'s shields deflect [attack_text] in a shower of sparks!</span>")
current_charges--
recharge_cooldown = world.time + recharge_delay
processing_objects |= src
START_PROCESSING(SSobj, src)
if(current_charges <= 0)
owner.visible_message("[owner]'s shield overloads!")
shield_state = "broken"
@@ -643,7 +643,7 @@
/obj/item/clothing/suit/space/hardsuit/shielded/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/clothing/suit/space/hardsuit/shielded/process()
@@ -652,7 +652,7 @@
playsound(loc, 'sound/magic/charge.ogg', 50, 1)
if(current_charges == max_charges)
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
shield_state = "[shield_on]"
if(istype(loc, /mob/living/carbon/human))
var/mob/living/carbon/human/C = loc
code/modules/clothing/spacesuits/rig/rig.dm
+2 -2
View File
@@ -110,7 +110,7 @@
spark_system.set_up(5, 0, src)
spark_system.attach(src)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
if(initial_modules && initial_modules.len)
for(var/path in initial_modules)
@@ -166,7 +166,7 @@
if(istype(M))
M.unEquip(piece)
qdel(piece)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
QDEL_NULL(wires)
QDEL_NULL(spark_system)
return ..()
code/modules/clothing/suits/miscellaneous.dm
+9 -9
View File
@@ -186,10 +186,10 @@
/obj/item/clothing/suit/corgisuit/super_hero/en/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/clothing/suit/corgisuit/super_hero/en/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/clothing/suit/corgisuit/super_hero/en/process()
@@ -883,7 +883,7 @@
/obj/item/clothing/suit/advanced_protective_suit/Destroy()
if(on)
on = 0
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/clothing/suit/advanced_protective_suit/ui_action_click()
@@ -893,7 +893,7 @@
else
on = 1
to_chat(usr, "You turn the suit's special processes on.")
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/clothing/suit/advanced_protective_suit/IsReflect()
@@ -912,7 +912,7 @@
if(user.reagents.get_reagent_amount("syndicate_nanites") < 15)
user.reagents.add_reagent("syndicate_nanites", 15)
else
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
//Syndicate Chaplain Robe (WOLOLO!)
/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe
@@ -924,22 +924,22 @@
if(linked_staff) //delink on destruction
linked_staff.robes = null
linked_staff = null
processing_objects -= src //probably is cleared in a parent call already, but just in case we're gonna do it here
STOP_PROCESSING(SSobj, src) //probably is cleared in a parent call already, but just in case we're gonna do it here
return ..()
/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/equipped(mob/living/carbon/human/H, slot)
if(!istype(H) || slot != slot_wear_suit)
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return
else
processing_objects |= src
START_PROCESSING(SSobj, src)
/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/process()
if(!linked_staff) //if we don't have a linked staff, the rest of this is useless
return
if(!ishuman(loc)) //if we somehow try to process while not on a human, remove ourselves from processing and return
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return
var/mob/living/carbon/human/H = loc
code/modules/clothing/under/accessories/accessory.dm
+4 -4
View File
@@ -574,7 +574,7 @@
/obj/item/clothing/accessory/petcollar/Destroy()
QDEL_NULL(access_id)
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/clothing/accessory/petcollar/attack_self(mob/user as mob)
@@ -617,10 +617,10 @@
/obj/item/clothing/accessory/petcollar/equipped(mob/living/simple_animal/user)
if(istype(user))
processing_objects |= src
START_PROCESSING(SSobj, src)
/obj/item/clothing/accessory/petcollar/dropped(mob/living/simple_animal/user)
processing_objects -= src
STOP_PROCESSING(SSobj, src)
/obj/item/clothing/accessory/petcollar/process()
var/mob/living/simple_animal/M = loc
@@ -636,7 +636,7 @@
else
a.autosay("[M] has been vandalized in [t.name]!", "[M]'s Death Alarm")
qdel(a)
processing_objects -= src
STOP_PROCESSING(SSobj, src)
/proc/english_accessory_list(obj/item/clothing/under/U)
if(!istype(U) || !U.accessories.len)
code/modules/countdown/countdown.dm
+3 -3
View File
@@ -28,13 +28,13 @@
/obj/effect/countdown/proc/start()
if(!started)
GLOB.fast_processing += src
START_PROCESSING(SSfastprocess, src)
started = TRUE
/obj/effect/countdown/proc/stop()
if(started)
maptext = null
GLOB.fast_processing -= src
STOP_PROCESSING(SSfastprocess, src)
started = FALSE
/obj/effect/countdown/proc/get_value()
@@ -57,7 +57,7 @@
/obj/effect/countdown/Destroy()
attached_to = null
GLOB.fast_processing -= src
STOP_PROCESSING(SSfastprocess, src)
return ..()
/obj/effect/countdown/ex_act(severity) //immune to explosions
code/modules/customitems/item_defines.dm
+2 -2
View File
@@ -760,10 +760,10 @@
/obj/item/clothing/head/pirate/fluff/stumpy/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/clothing/head/pirate/fluff/stumpy/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/clothing/head/pirate/fluff/stumpy/process()
code/modules/events/event.dm
+1 -1
View File
@@ -105,7 +105,7 @@
//Do not override this proc, instead use the appropiate procs.
//This proc will handle the calls to the appropiate procs.
/datum/event/proc/process()
/datum/event/process()
if(!processing)
return
code/modules/events/event_container.dm
+1 -1
View File
@@ -22,7 +22,7 @@ var/list/event_last_fired = list()
var/last_world_time = 0
/datum/event_container/proc/process()
/datum/event_container/process()
if(!next_event_time)
set_event_delay()
code/modules/events/spacevine.dm
+2 -2
View File
@@ -539,7 +539,7 @@
/obj/structure/spacevine_controller/New(loc, list/muts, potency, production)
color = "#ffffff"
spawn_spacevine_piece(loc, , muts)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
init_subtypes(/datum/spacevine_mutation/, mutations_list)
if(potency != null && potency > 0)
// 1 mutativeness at 10 potency
@@ -567,7 +567,7 @@
return
/obj/structure/spacevine_controller/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/structure/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/structure/spacevine/parent, list/muts)
code/modules/flufftext/Hallucination.dm
+2 -2
View File
@@ -138,7 +138,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(target.client)
target.client.images |= flood_images
next_expand = world.time + FAKE_FLOOD_EXPAND_TIME
processing_objects += src
START_PROCESSING(SSobj, src)
/obj/effect/hallucination/fake_flood/process()
if(next_expand <= world.time)
@@ -162,7 +162,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
target.client.images |= flood_images
/obj/effect/hallucination/fake_flood/Destroy()
processing_objects -= src
STOP_PROCESSING(SSobj, src)
flood_turfs.Cut()
if(target.client)
target.client.images.Remove(flood_images)
code/modules/hydroponics/beekeeping/beebox.dm
+2 -2
View File
@@ -47,11 +47,11 @@
/obj/structure/beebox/Initialize(mapload)
. = ..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/structure/beebox/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
B.beehome = null
bees.Cut()
code/modules/hydroponics/grown/towercap.dm
+2 -2
View File
@@ -151,7 +151,7 @@
burning = 1
set_light(6, l_color = "#ED9200")
Burn()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/structure/bonfire/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
@@ -186,7 +186,7 @@
icon_state = "bonfire"
burning = 0
set_light(0)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
/obj/structure/bonfire/buckle_mob(mob/living/M, force = 0)
if(..())
code/modules/mining/lavaland/loot/ashdragon_loot.dm
+2 -2
View File
@@ -35,14 +35,14 @@
/obj/item/melee/ghost_sword/New()
..()
spirits = list()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
GLOB.poi_list |= src
/obj/item/melee/ghost_sword/Destroy()
for(var/mob/dead/observer/G in spirits)
G.invisibility = initial(G.invisibility)
spirits.Cut()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
GLOB.poi_list -= src
. = ..()
code/modules/mining/lavaland/loot/colossus_loot.dm
+2 -2
View File
@@ -436,7 +436,7 @@
..()
if(isanimal(loc))
holder_animal = loc
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/structure/closet/stasis/Entered(atom/A)
if(isliving(A) && holder_animal)
@@ -450,7 +450,7 @@
holder_animal.verbs -= /mob/living/verb/pulled
/obj/structure/closet/stasis/dump_contents(var/kill = 1)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
for(var/mob/living/L in src)
L.disabilities &= ~MUTE
L.status_flags &= ~GODMODE
code/modules/mob/holder.dm
+2 -2
View File
@@ -7,10 +7,10 @@
/obj/item/holder/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/holder/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/holder/process()
code/modules/mob/living/carbon/brain/brain_item.dm
+1 -1
View File
@@ -107,7 +107,7 @@
/obj/item/organ/internal/brain/necrotize(update_sprite = TRUE) //Brain also has special handling for when it necrotizes
damage = max_damage
status |= ORGAN_DEAD
processing_objects -= src
STOP_PROCESSING(SSobj, src)
if(dead_icon && !is_robotic())
icon_state = dead_icon
if(owner && vital)
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+3 -3
View File
@@ -299,7 +299,7 @@ var/global/chicken_count = 0
E.pixel_y = rand(-6,6)
if(eggsFertile)
if(chicken_count < MAX_CHICKENS && prob(25))
processing_objects.Add(E)
START_PROCESSING(SSobj, E)
/obj/item/reagent_containers/food/snacks/egg/var/amount_grown = 0
/obj/item/reagent_containers/food/snacks/egg/process()
@@ -308,10 +308,10 @@ var/global/chicken_count = 0
if(amount_grown >= 100)
visible_message("[src] hatches with a quiet cracking sound.")
new /mob/living/simple_animal/chick(get_turf(src))
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
qdel(src)
else
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
/mob/living/simple_animal/pig
code/modules/modular_computers/computers/item/computer.dm
+2 -2
View File
@@ -50,7 +50,7 @@
if(!physical)
physical = src
..()
processing_objects += src
START_PROCESSING(SSobj, src)
all_components = list()
idle_threads = list()
@@ -64,7 +64,7 @@
all_components.Remove(CH.device_type)
qdel(CH)
physical = null
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return ..()
code/modules/nano/nanoui.dm
+1 -1
View File
@@ -506,7 +506,7 @@ nanoui is used to open and update nano browser uis
*
* @return nothing
*/
/datum/nanoui/proc/process(update = 0)
/datum/nanoui/process(update = 0)
if(!src_object || !user)
close()
return
code/modules/paperwork/paper.dm
+2 -2
View File
@@ -621,11 +621,11 @@
/obj/item/paper/evilfax/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/paper/evilfax/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
if(mytarget && !used)
var/mob/living/carbon/target = mytarget
target.ForceContractDisease(new /datum/disease/transformation/corgi(0))
code/modules/pda/mob_hunt_game_app.dm
+2 -2
View File
@@ -21,12 +21,12 @@
/datum/data/pda/app/mob_hunter_game/start()
..()
processing_objects.Add(pda)
START_PROCESSING(SSobj, pda)
/datum/data/pda/app/mob_hunter_game/stop()
..()
disconnect("Program Terminated")
processing_objects.Remove(pda)
STOP_PROCESSING(SSobj, pda)
/datum/data/pda/app/mob_hunter_game/proc/scan_nearby()
if(!SSmob_hunt || !connected)
code/modules/power/cell.dm
+4 -4
View File
@@ -21,23 +21,23 @@
/obj/item/stock_parts/cell/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
charge = maxcharge
if(ratingdesc)
desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it."
update_icon()
/obj/item/stock_parts/cell/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/stock_parts/cell/vv_edit_var(var_name, var_value)
switch(var_name)
if("self_recharge")
if(var_value)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/item/stock_parts/cell/process()
code/modules/power/singularity/singularity.dm
+2 -2
View File
@@ -35,7 +35,7 @@
src.energy = starting_energy
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
GLOB.poi_list |= src
GLOB.singularities += src
for(var/obj/machinery/power/singularity_beacon/singubeacon in GLOB.machines)
@@ -44,7 +44,7 @@
break
/obj/singularity/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
GLOB.poi_list.Remove(src)
GLOB.singularities -= src
target = null
code/modules/power/smes.dm
-1
View File
@@ -13,7 +13,6 @@
icon_state = "smes"
density = 1
anchored = 1
defer_process = 1
var/capacity = 5e6 // maximum charge
var/charge = 0 // actual charge
code/modules/projectiles/guns/alien.dm
+2 -2
View File
@@ -15,10 +15,10 @@
/obj/item/gun/projectile/automatic/spikethrower/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/gun/projectile/automatic/spikethrower/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/gun/projectile/automatic/spikethrower/update_icon()
code/modules/projectiles/guns/energy.dm
+4 -4
View File
@@ -32,7 +32,7 @@
power_supply.give(power_supply.maxcharge)
update_ammo_types()
if(selfcharge)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
update_icon()
/obj/item/gun/energy/proc/update_ammo_types()
@@ -47,7 +47,7 @@
/obj/item/gun/energy/Destroy()
if(selfcharge)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/gun/energy/process()
@@ -167,9 +167,9 @@
switch(var_name)
if("selfcharge")
if(var_value)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
else
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/item/gun/energy/proc/robocharge()
code/modules/projectiles/guns/energy/special.dm
+2 -2
View File
@@ -340,11 +340,11 @@
/obj/item/gun/energy/temperature/New()
..()
update_icon()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/gun/energy/temperature/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/gun/energy/temperature/newshot()
code/modules/projectiles/guns/magic.dm
+2 -2
View File
@@ -51,12 +51,12 @@
charges = max_charges
chambered = new ammo_type(src)
if(can_charge)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/gun/magic/Destroy()
if(can_charge)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
code/modules/projectiles/guns/medbeam.dm
+2 -2
View File
@@ -17,10 +17,10 @@
/obj/item/gun/medbeam/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/gun/medbeam/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/gun/medbeam/handle_suicide()
code/modules/reagents/chemistry/holder.dm
+6 -6
View File
@@ -16,7 +16,7 @@ var/const/INGEST = 2
/datum/reagents/New(maximum = 100)
maximum_volume = maximum
if(!(flags & REAGENT_NOREACT))
processing_objects |= src
START_PROCESSING(SSobj, src)
//I dislike having these here but map-objects are initialised before world/New() is called. >_>
if(!GLOB.chemical_reagents_list)
//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
@@ -333,9 +333,9 @@ var/const/INGEST = 2
od_chems.Add(R.id)
return od_chems
/datum/reagents/proc/process()
/datum/reagents/process()
if(flags & REAGENT_NOREACT)
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return
for(var/datum/reagent/R in reagent_list)
@@ -346,9 +346,9 @@ var/const/INGEST = 2
// Order is important, process() can remove from processing if
// the flag is present
flags &= ~(REAGENT_NOREACT)
processing_objects |= src
START_PROCESSING(SSobj, src)
else
processing_objects -= src
STOP_PROCESSING(SSobj, src)
flags |= REAGENT_NOREACT
/*
@@ -819,7 +819,7 @@ var/const/INGEST = 2
/datum/reagents/Destroy()
. = ..()
processing_objects -= src
STOP_PROCESSING(SSobj, src)
QDEL_LIST(reagent_list)
reagent_list = null
QDEL_LIST(addiction_list)
code/modules/reagents/reagent_containers/borghydro.dm
+2 -2
View File
@@ -38,10 +38,10 @@
for(var/R in reagent_ids)
add_reagent(R)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/reagent_containers/borghypo/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
code/modules/reagents/reagent_containers/iv_bag.dm
+2 -2
View File
@@ -42,11 +42,11 @@
/obj/item/reagent_containers/iv_bag/proc/begin_processing(mob/target)
injection_target = target
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/reagent_containers/iv_bag/proc/end_processing()
injection_target = null
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
/obj/item/reagent_containers/iv_bag/process()
if(!injection_target)
code/modules/spacepods/spacepod.dm
+2 -2
View File
@@ -152,7 +152,7 @@
if(src.empcounter > 0)
src.empcounter--
else
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
/obj/spacepod/proc/update_icons()
if(!pod_overlays)
@@ -286,7 +286,7 @@
deal_damage(80 / severity)
if(empcounter < (40 / severity))
empcounter = 40 / severity
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
switch(severity)
if(1)
code/modules/surgery/organs/body_egg.dm
+2 -2
View File
@@ -13,13 +13,13 @@
/obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0)
..()
owner.status_flags |= XENO_HOST
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
owner.med_hud_set_status()
spawn(0)
AddInfectionImages(owner)
/obj/item/organ/internal/body_egg/remove(var/mob/living/carbon/M, special = 0)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
if(owner)
owner.status_flags &= ~(XENO_HOST)
owner.med_hud_set_status()
code/modules/surgery/organs/organ.dm
+4 -4
View File
@@ -33,7 +33,7 @@
/obj/item/organ/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
if(owner)
remove(owner, 1)
QDEL_LIST_ASSOC_VAL(autopsy_data)
@@ -84,7 +84,7 @@
/obj/item/organ/proc/necrotize(update_sprite = TRUE)
damage = max_damage
status |= ORGAN_DEAD
processing_objects -= src
STOP_PROCESSING(SSobj, src)
if(dead_icon && !is_robotic())
icon_state = dead_icon
if(owner && vital)
@@ -189,7 +189,7 @@
else
status = 0
if(!owner)
processing_objects |= src
START_PROCESSING(SSobj, src)
/obj/item/organ/proc/is_damaged()
return damage > 0
@@ -295,7 +295,7 @@
if(affected) affected.internal_organs -= src
loc = get_turf(owner)
processing_objects |= src
START_PROCESSING(SSobj, src)
if(owner && vital && is_primary_organ()) // I'd do another check for species or whatever so that you couldn't "kill" an IPC by removing a human head from them, but it doesn't matter since they'll come right back from the dead
add_attack_logs(user, owner, "Removed vital organ ([src])", !!user ? ATKLOG_FEW : ATKLOG_ALL)
code/modules/surgery/organs/organ_external.dm
+1 -1
View File
@@ -286,7 +286,7 @@ This function completely restores a damaged organ to perfect condition.
owner.updatehealth("limb rejuvenate")
update_icon()
if(!owner)
processing_objects |= src
START_PROCESSING(SSobj, src)
/****************************************************
PROCESSING & UPDATING
code/modules/surgery/organs/organ_internal.dm
+2 -2
View File
@@ -193,10 +193,10 @@
/obj/item/organ/internal/shadowtumor/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/organ/internal/shadowtumor/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/organ/internal/shadowtumor/process()
code/modules/telesci/gps.dm
+3 -3
View File
@@ -137,10 +137,10 @@ var/list/GPS_list = list()
for marking the area around the transition edges."
var/list/turf/tagged
/obj/item/gps/visible_debug/New()
/obj/item/gps/visible_debug/Initialize(mapload)
. = ..()
tagged = list()
GLOB.fast_processing.Add(src)
START_PROCESSING(SSfastprocess, src)
/obj/item/gps/visible_debug/process()
var/turf/T = get_turf(src)
@@ -161,5 +161,5 @@ var/list/GPS_list = list()
if(tagged)
clear()
tagged = null
GLOB.fast_processing.Remove(src)
STOP_PROCESSING(SSfastprocess, src)
. = ..()