Merge pull request #4684 from VOREStation/upstream-merge-5814

[MIRROR] [READY]Makes a bunch of processes subsystems instead

code/controllers/Processes/air.dm

@@ -1,23 +0,0 @@
-/datum/controller/process/air/setup()
-	name = "air"
-	schedule_interval = 20 // every 2 seconds
-	start_delay = 4
-
-	if(!air_master)
-		air_master = new
-		air_master.Setup()
-
-/datum/controller/process/air/doWork()
-	if(!air_processing_killed)
-		if(!air_master.Tick()) //Runtimed.
-			air_master.failed_ticks++
-
-			if(air_master.failed_ticks > 5)
-				world << "<SPAN CLASS='danger'>RUNTIMES IN ATMOS TICKER.  Killing air simulation!</SPAN>"
-				world.log << "### ZAS SHUTDOWN"
-
-				message_admins("ZASALERT: Shutting down! status: [air_master.tick_progress]")
-				log_admin("ZASALERT: Shutting down! status: [air_master.tick_progress]")
-
-				air_processing_killed = TRUE
-				air_master.failed_ticks = 0

code/controllers/Processes/chemistry.dm

@@ -1,33 +0,0 @@
-var/datum/controller/process/chemistry/chemistryProcess
-
-/datum/controller/process/chemistry
-	var/list/active_holders
-	var/list/chemical_reactions
-	var/list/chemical_reagents
-
-/datum/controller/process/chemistry/setup()
-	name = "chemistry"
-	schedule_interval = 20 // every 2 seconds
-	chemistryProcess = src
-	active_holders = list()
-	chemical_reactions = chemical_reactions_list
-	chemical_reagents = chemical_reagents_list
-
-/datum/controller/process/chemistry/statProcess()
-	..()
-	stat(null, "[active_holders.len] reagent holder\s")
-
-/datum/controller/process/chemistry/doWork()
-	for(last_object in active_holders)
-		var/datum/reagents/holder = last_object
-		if(!holder.process_reactions())
-			active_holders -= holder
-		SCHECK
-
-/datum/controller/process/chemistry/proc/mark_for_update(var/datum/reagents/holder)
-	if(holder in active_holders)
-		return
-
-	//Process once, right away. If we still need to continue then add to the active_holders list and continue later
-	if(holder.process_reactions())
-		active_holders += holder

code/controllers/Processes/event.dm

@@ -1,6 +0,0 @@
-/datum/controller/process/event/setup()
-	name = "event controller"
-	schedule_interval = 20 // every 2 seconds
-
-/datum/controller/process/event/doWork()
-	event_manager.process()

code/controllers/Processes/nanoui.dm

@@ -1,19 +0,0 @@
-/datum/controller/process/nanoui/setup()
-	name = "nanoui"
-	schedule_interval = 20 // every 2 seconds
-
-/datum/controller/process/nanoui/statProcess()
-	..()
-	stat(null, "[GLOB.nanomanager.processing_uis.len] UIs")
-
-/datum/controller/process/nanoui/doWork()
-	for(last_object in GLOB.nanomanager.processing_uis)
-		var/datum/nanoui/NUI = last_object
-		if(istype(NUI) && !QDELETED(NUI))
-			try
-				NUI.process()
-			catch(var/exception/e)
-				catchException(e, NUI)
-		else
-			catchBadType(NUI)
-			GLOB.nanomanager.processing_uis -= NUI

code/controllers/Processes/turf.dm

@@ -1,16 +0,0 @@
-var/global/list/turf/processing_turfs = list()
-
-/datum/controller/process/turf/setup()
-	name = "turf"
-	schedule_interval = 20 // every 2 seconds
-
-/datum/controller/process/turf/doWork()
-	for(last_object in processing_turfs)
-		var/turf/T = last_object
-		if(T.process() == PROCESS_KILL)
-			processing_turfs.Remove(T)
-		SCHECK
-
-/datum/controller/process/turf/statProcess()
-	..()
-	stat(null, "[processing_turfs.len] turf\s")

code/controllers/subsystems/creation.dm

@@ -1,29 +0,0 @@
-//
-// Creation subsystem, which is responsible for initializing newly created objects.
-//
-SUBSYSTEM_DEF(creation)
-	name = "Creation"
-	priority = 14
-	wait = 5
-//	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
-	flags = SS_NO_FIRE|SS_NO_INIT
-	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
-
-	var/list/atoms_needing_initialize = list()
-
-	var/map_loading = FALSE
-
-/datum/controller/subsystem/creation/StartLoadingMap(var/quiet)
-	map_loading = TRUE
-
-/datum/controller/subsystem/creation/StopLoadingMap(var/quiet)
-	map_loading = FALSE
-
-/datum/controller/subsystem/creation/proc/initialize_late_atoms()
-	admin_notice("<span class='danger'>Initializing atoms in submap.</span>", R_DEBUG)
-	var/total_atoms = atoms_needing_initialize.len
-	for(var/atom/movable/A in atoms_needing_initialize)
-		if(!QDELETED(A))
-			A.Initialize()
-		atoms_needing_initialize -= A
-	admin_notice("<span class='danger'>Initalized [total_atoms] atoms in submap.</span>", R_DEBUG)

code/controllers/subsystems/events.dm

@@ -0,0 +1,72 @@
+SUBSYSTEM_DEF(events)
+	name = "Events"
+	wait = 20
+
+	var/list/datum/event/active_events = list()
+	var/list/datum/event/finished_events = list()
+
+	var/list/datum/event/allEvents
+	var/list/datum/event_container/event_containers
+
+	var/datum/event_meta/new_event = new
+
+/datum/controller/subsystem/events/Initialize()
+	event_containers = list(
+			EVENT_LEVEL_MUNDANE 	= new/datum/event_container/mundane,
+			EVENT_LEVEL_MODERATE	= new/datum/event_container/moderate,
+			EVENT_LEVEL_MAJOR 		= new/datum/event_container/major
+		)
+	allEvents = typesof(/datum/event) - /datum/event
+	return ..()
+
+/datum/controller/subsystem/events/fire(resumed)
+	for(var/datum/event/E in active_events)
+		E.process()
+
+	for(var/i = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR)
+		var/list/datum/event_container/EC = event_containers[i]
+		EC.process()
+
+/datum/controller/subsystem/events/Recover()
+	if(SSevents.active_events)
+		active_events |= SSevents.active_events
+	if(SSevents.finished_events)
+		finished_events |= SSevents.finished_events
+
+/datum/controller/subsystem/events/proc/event_complete(var/datum/event/E)
+	if(!E.event_meta || !E.severity)	// datum/event is used here and there for random reasons, maintaining "backwards compatibility"
+		log_debug("Event of '[E.type]' with missing meta-data has completed.")
+		return
+
+	finished_events += E
+
+	// Add the event back to the list of available events
+	var/datum/event_container/EC = event_containers[E.severity]
+	var/datum/event_meta/EM = E.event_meta
+	if(EM.add_to_queue)
+		EC.available_events += EM
+
+	log_debug("Event '[EM.name]' has completed at [worldtime2stationtime(world.time)].")
+
+/datum/controller/subsystem/events/proc/delay_events(var/severity, var/delay)
+	var/list/datum/event_container/EC = event_containers[severity]
+	EC.next_event_time += delay
+
+/datum/controller/subsystem/events/proc/RoundEnd()
+	if(!report_at_round_end)
+		return
+
+	to_chat(world, "<br><br><br><font size=3><b>Random Events This Round:</b></font>")
+	for(var/datum/event/E in active_events|finished_events)
+		var/datum/event_meta/EM = E.event_meta
+		if(EM.name == "Nothing")
+			continue
+		var/message = "'[EM.name]' began at [worldtime2stationtime(E.startedAt)] "
+		if(E.isRunning)
+			message += "and is still running."
+		else
+			if(E.endedAt - E.startedAt > MinutesToTicks(5)) // Only mention end time if the entire duration was more than 5 minutes
+				message += "and ended at [worldtime2stationtime(E.endedAt)]."
+			else
+				message += "and ran to completion."
+		to_chat(world, message)

code/controllers/subsystems/nanoui.dm

@@ -0,0 +1,42 @@
+SUBSYSTEM_DEF(nanoui)
+	name = "NanoUI"
+	wait = 20
+	// a list of current open /nanoui UIs, grouped by src_object and ui_key
+	var/list/open_uis = list()
+	// a list of current open /nanoui UIs, not grouped, for use in processing
+	var/list/processing_uis = list()
+	// a list of asset filenames which are to be sent to the client on user logon
+	var/list/asset_files = list()
+
+/datum/controller/subsystem/nanoui/Initialize()
+	var/list/nano_asset_dirs = list(\
+		"nano/css/",\
+		"nano/images/",\
+		"nano/js/",\
+		"nano/templates/"\
+	)
+
+	var/list/filenames = null
+	for (var/path in nano_asset_dirs)
+		filenames = flist(path)
+		for(var/filename in filenames)
+			if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore
+				if(fexists(path + filename))
+					asset_files.Add(fcopy_rsc(path + filename)) // add this file to asset_files for sending to clients when they connect
+	return ..()
+
+/datum/controller/subsystem/nanoui/Recover()
+	if(SSnanoui.open_uis)
+		open_uis |= SSnanoui.open_uis
+	if(SSnanoui.processing_uis)
+		processing_uis |= SSnanoui.processing_uis
+	if(SSnanoui.asset_files)
+		asset_files |= SSnanoui.asset_files
+
+/datum/controller/subsystem/nanoui/stat_entry()
+	return ..("[processing_uis.len] UIs")
+
+/datum/controller/subsystem/nanoui/fire(resumed)
+	for(var/thing in processing_uis)
+		var/datum/nanoui/UI = thing
+		UI.process()

code/controllers/subsystems/processing/chemistry.dm

@@ -0,0 +1,43 @@
+PROCESSING_SUBSYSTEM_DEF(chemistry)
+	name = "Chemistry"
+	wait = 20
+	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING
+	init_order = INIT_ORDER_CHEMISTRY
+	var/list/chemical_reactions = list()
+	var/list/chemical_reagents = list()
+
+/datum/controller/subsystem/processing/chemistry/Recover()
+	chemical_reactions = SSchemistry.chemical_reactions
+	chemical_reagents = SSchemistry.chemical_reagents
+
+/datum/controller/subsystem/processing/chemistry/Initialize()
+	initialize_chemical_reactions()
+	initialize_chemical_reagents()
+
+//Chemical Reactions - Initialises all /datum/chemical_reaction into a list
+// It is filtered into multiple lists within a list.
+// For example:
+// chemical_reaction_list["phoron"] is a list of all reactions relating to phoron
+// Note that entries in the list are NOT duplicated. So if a reaction pertains to
+// more than one chemical it will still only appear in only one of the sublists.
+/datum/controller/subsystem/processing/chemistry/proc/initialize_chemical_reactions()
+	var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction
+	SSchemistry.chemical_reactions = list()
+
+	for(var/path in paths)
+		var/datum/chemical_reaction/D = new path()
+		if(D.required_reagents && D.required_reagents.len)
+			var/reagent_id = D.required_reagents[1]
+			if(!chemical_reactions[reagent_id])
+				chemical_reactions[reagent_id] = list()
+			chemical_reactions[reagent_id] += D
+
+//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
+/datum/controller/subsystem/processing/chemistry/proc/initialize_chemical_reagents()
+	var/paths = typesof(/datum/reagent) - /datum/reagent
+	chemical_reagents = list()
+	for(var/path in paths)
+		var/datum/reagent/D = new path()
+		if(!D.name)
+			continue
+		chemical_reagents[D.id] = D

code/controllers/subsystems/processing/turfs.dm

@@ -0,0 +1,3 @@
+PROCESSING_SUBSYSTEM_DEF(turfs)
+	name = "Turf Processing"
+	wait = 20

code/controllers/verbs.dm

@@ -63,7 +63,7 @@
 		usr.client.debug_variables(antag)
 		message_admins("Admin [key_name_admin(usr)] is debugging the [antag.role_text] template.")
 
-/client/proc/debug_controller(controller in list("Master","Ticker","Ticker Process","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data","Event","Plants","Alarm","Nano","Chemistry","Vote","Xenobio","Planets"))
+/client/proc/debug_controller(controller in list("Master","Ticker","Ticker Process","Air","Jobs","Radio","Supply","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data","Plants","Alarm","Xenobio"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -91,9 +91,6 @@
 		if("Supply")
 			debug_variables(supply_controller)
 			feedback_add_details("admin_verb","DSupply")
-		if("Shuttles")
-			debug_variables(shuttle_controller)
-			feedback_add_details("admin_verb","DShuttles")
 		if("Emergency Shuttle")
 			debug_variables(emergency_shuttle)
 			feedback_add_details("admin_verb","DEmergency")
@@ -112,21 +109,12 @@
 		if("Gas Data")
 			debug_variables(gas_data)
 			feedback_add_details("admin_verb","DGasdata")
-		if("Event")
-			debug_variables(event_manager)
-			feedback_add_details("admin_verb", "DEvent")
 		if("Plants")
 			debug_variables(plant_controller)
 			feedback_add_details("admin_verb", "DPlants")
 		if("Alarm")
 			debug_variables(alarm_manager)
 			feedback_add_details("admin_verb", "DAlarm")
-		if("Nano")
-			debug_variables(GLOB.nanomanager)
-			feedback_add_details("admin_verb", "DNano")
-		if("Chemistry")
-			debug_variables(chemistryProcess)
-			feedback_add_details("admin_verb", "DChem")
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
 	return