From c06ad7e6b8dcef8445b5e448e36003fa791914d0 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Tue, 7 Apr 2015 17:13:59 -0700 Subject: [PATCH] moved process() to datum. made /datum/reagents/ process instead of the containers. --- code/ATMOSPHERICS/datum_pipeline.dm | 2 +- code/controllers/failsafe.dm | 2 +- code/controllers/master_controller.dm | 2 +- code/controllers/subsystem/objects.dm | 4 ++++ code/datums/diseases/_disease.dm | 2 +- code/datums/helper_datums/global_iterator.dm | 2 +- code/game/gamemodes/game_mode.dm | 2 +- .../embedded_controller_base.dm | 2 +- code/game/objects/effects/decals/Cleanable/misc.dm | 14 +------------- code/game/objects/items/weapons/cigs_lighters.dm | 1 - code/game/objects/objs.dm | 4 ---- code/modules/events/event.dm | 2 +- .../food&drinks/kitchen machinery/processor.dm | 10 +++++----- code/modules/nano/nanoui.dm | 2 +- code/modules/reagents/Chemistry-Holder.dm | 5 +++-- code/modules/reagents/reagent_containers.dm | 11 ----------- 16 files changed, 22 insertions(+), 45 deletions(-) diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index c654e930bc2e..d09df8ed19e6 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -22,7 +22,7 @@ A.nullifyPipenet(src) ..() -/datum/pipeline/proc/process()//This use to be called called from the pipe networks +/datum/pipeline/process()//This use to be called called from the pipe networks if(update) update = 0 reconcile_air() diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 737ac4df64ab..86aef1dc0566 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -15,7 +15,7 @@ var/datum/controller/failsafe/Failsafe Failsafe.process() -/datum/controller/failsafe/proc/process() +/datum/controller/failsafe/process() spawn(0) while(1) //more efficient than recursivly calling ourself over and over. background = 1 ensures we do not trigger an infinite loop if(!master_controller) new /datum/controller/game_controller() //replace the missing master_controller! This should never happen. diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 46379e1ed8ba..cd9aced630c0 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -65,7 +65,7 @@ Note: you can set the datum's defined processing_interval to some integer to set //used for smoothing out the cost values so they don't fluctuate wildly #define MC_AVERAGE(average, current) (0.8*(average) + 0.2*(current)) -/datum/controller/game_controller/proc/process() +/datum/controller/game_controller/process() if(!Failsafe) new /datum/controller/failsafe() spawn(0) var/timer = world.time diff --git a/code/controllers/subsystem/objects.dm b/code/controllers/subsystem/objects.dm index e54c5bc0faaa..34104df2e0d9 100644 --- a/code/controllers/subsystem/objects.dm +++ b/code/controllers/subsystem/objects.dm @@ -1,5 +1,9 @@ var/datum/subsystem/objects/SSobj +/datum/proc/process() + SSobj.processing.Remove(src) + return 0 + /datum/subsystem/objects name = "Objects" priority = 12 diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index cd55cc37db9d..f7772c5ac2b1 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -126,7 +126,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease C.ContractDisease(src) -/datum/disease/proc/process() +/datum/disease/process() if(!holder) SSdisease.processing -= src return diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm index 1c6d5ce341e7..828f6cfe559c 100644 --- a/code/datums/helper_datums/global_iterator.dm +++ b/code/datums/helper_datums/global_iterator.dm @@ -115,7 +115,7 @@ Data storage vars: CRASH("The global_iterator loop \ref[src] failed to terminate in designated timeframe. This may be caused by server lagging.") return 1 -/datum/global_iterator/proc/process() +/datum/global_iterator/process() return /datum/global_iterator/proc/active() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 65296e763546..511fb4026585 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -161,7 +161,7 @@ ///process() ///Called by the gameticker -/datum/game_mode/proc/process() +/datum/game_mode/process() return 0 diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index b7645d58a2b9..6f9b91169b02 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -14,7 +14,7 @@ datum/computer/file/embedded_program/proc/receive_user_command(command) datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param) return null -datum/computer/file/embedded_program/proc/process() +datum/computer/file/embedded_program/process() return 0 obj/machinery/embedded_controller diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index bb21602d237e..c6bb4c6a7371 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -141,16 +141,4 @@ gender = PLURAL icon = 'icons/obj/objects.dmi' icon_state = "ash" - anchored = 1 -/obj/effect/decal/cleanable/chem_pile/New() - ..() - SSobj.processing |= src - -/obj/effect/decal/cleanable/chem_pile/Destroy() - SSobj.processing.Remove(src) - ..() - -/obj/effect/decal/cleanable/chem_pile/process() - if(reagents) - reagents.reagent_on_tick() - return \ No newline at end of file + anchored = 1 \ No newline at end of file diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index f2abe837b864..075bab36a2ac 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -196,7 +196,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/proc/handle_reagents() - reagents.reagent_on_tick() if(iscarbon(loc)) var/mob/living/carbon/C = loc if (src == C.wear_mask) // if it's in the human/monkey mouth, transfer reagents to the mob diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 0685f81d020e..bf297b6a8b34 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -10,10 +10,6 @@ var/damtype = "brute" var/force = 0 -/obj/proc/process() - SSobj.processing.Remove(src) - return 0 - /obj/Destroy() if(!istype(src, /obj/machinery)) SSobj.processing.Remove(src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm index e55c3203f4c1..e9661d5dc7c2 100644 --- a/code/modules/events/event.dm +++ b/code/modules/events/event.dm @@ -86,7 +86,7 @@ //Do not override this proc, instead use the appropiate procs. //This proc will handle the calls to the appropiate procs. -/datum/round_event/proc/process() +/datum/round_event/process() if(!processing) return diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm index f34053de43c6..470c09315ae5 100644 --- a/code/modules/food&drinks/kitchen machinery/processor.dm +++ b/code/modules/food&drinks/kitchen machinery/processor.dm @@ -19,11 +19,11 @@ var/input var/output var/time = 40 - proc/process(loc, what) - if (src.output && loc) - new src.output(loc) - if (what) - qdel(what) // Note to self: Make this safer +/datum/food_processor_process/proc/process_food(loc, what) + if (src.output && loc) + new src.output(loc) + if (what) + qdel(what) // Note to self: Make this safer /* objs */ /datum/food_processor_process/meat diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index c38714a1a63e..6b67a64ac3fd 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -402,7 +402,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 diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 5f8f59ba0217..98496d254fee 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -17,7 +17,7 @@ datum/reagents datum/reagents/New(maximum=100) maximum_volume = maximum - + SSobj.processing |= src //I dislike having these here but map-objects are initialised before world/New() is called. >_> if(!chemical_reagents_list) //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id @@ -53,6 +53,7 @@ datum/reagents/New(maximum=100) datum/reagents/Destroy() ..() + SSobj.processing.Remove(src) for(var/datum/reagent/R in reagent_list) qdel(R) reagent_list.Cut() @@ -260,7 +261,7 @@ datum/reagents/proc/metabolize(var/mob/M) last_tick++ update_total() -datum/reagents/proc/reagent_on_tick() +datum/reagents/process() for(var/datum/reagent/R in reagent_list) R.on_tick() return diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 105c839f3344..ab4fd76f5ac7 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -35,11 +35,6 @@ reagents.add_reagent("blood", disease_amount, data) if(list_reagents) reagents.add_reagent_list(list_reagents) - SSobj.processing |= src - -/obj/item/weapon/reagent_containers/Destroy() - SSobj.processing.Remove(src) - ..() /obj/item/weapon/reagent_containers/attack_self(mob/user as mob) return @@ -83,12 +78,6 @@ return 0 return 1 - -/obj/item/weapon/reagent_containers/process() - if(reagents) - reagents.reagent_on_tick() - return - /obj/item/weapon/reagent_containers/ex_act() if(reagents) for(var/datum/reagent/R in reagents.reagent_list)