Attempt fix blackscreen (#18434)

* first reordering, committed in case i fuck up badly next * from the moment i understood the weakness of my flesh * sdafa * you asked for this * we can't have nice things * sdafasdf * sdafasd * sdfa * fsa * worth a shot * more pain * sdfasdf
2026-08-30 00:21:11 +01:00 · 2024-02-20 11:37:52 +00:00
parent 141dff58ab
commit 91e89a3d73
70 changed files with 412 additions and 393 deletions
@@ -7,7 +7,7 @@
 	name = "fire coderbus"

 	/// Order of initialization. Higher numbers are initialized first, lower numbers later. Use or create defines such as [INIT_ORDER_DEFAULT] so we can see the order in one file.
-	var/init_order = SS_INIT_MISC
+	var/init_order = INIT_ORDER_DEFAULT

 	/// Time to wait (in deciseconds) between each call to fire(). Must be a positive integer.
 	var/wait = 20
@@ -64,7 +64,7 @@ Class Procs:
 SUBSYSTEM_DEF(air)
 	name = "Air"
 	priority = SS_PRIORITY_AIR
-	init_order = SS_INIT_AIR
+	init_order = INIT_ORDER_AIR
 	flags = SS_POST_FIRE_TIMING
 	runlevels = RUNLEVELS_PLAYING

@@ -6,7 +6,7 @@

 SUBSYSTEM_DEF(alarm)
 	name = "Alarms"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	priority = SS_PRIORITY_ALARMS
 	runlevels = RUNLEVELS_PLAYING

@@ -3,7 +3,7 @@
 /// So this just serves to remove the requirement to load assets fully during init
 SUBSYSTEM_DEF(asset_loading)
 	name = "Asset Loading"
-	priority = SS_PRIORITY_ASSET
+	priority = FIRE_PRIORITY_ASSETS
 	flags = SS_NO_INIT
 	runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT
 	var/list/datum/asset/generate_queue = list()
@@ -1,27 +1,27 @@
 SUBSYSTEM_DEF(assets)
 	name = "Assets"
-	init_order = SS_INIT_ASSETS
+	init_order = INIT_ORDER_ASSETS
 	flags = SS_NO_FIRE
-	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 	var/list/datum/asset_cache_item/cache = list()
 	var/list/preload = list()
 	var/datum/asset_transport/transport = new()

-/datum/controller/subsystem/assets/Initialize()
+/datum/controller/subsystem/assets/OnConfigLoad()
 	var/newtransporttype = /datum/asset_transport
 	switch (GLOB.config.asset_transport)
 		if ("webroot")
 			newtransporttype = /datum/asset_transport/webroot

 	if (newtransporttype == transport.type)
-		return SS_INIT_SUCCESS
+		return

 	var/datum/asset_transport/newtransport = new newtransporttype ()
 	if (newtransport.validate_config())
 		transport = newtransport
-
 	transport.Load()

+
+/datum/controller/subsystem/assets/Initialize()
 	for(var/type in typesof(/datum/asset))
 		var/datum/asset/A = type
 		if (type != initial(A._abstract))
@@ -6,7 +6,7 @@

 SUBSYSTEM_DEF(battle_monsters)
 	name = "Battle Monsters"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_NO_FIRE

 	var/list/monster_elements
@@ -9,8 +9,8 @@ SUBSYSTEM_DEF(chat)
 	name = "Chat"
 	flags = SS_TICKER | SS_NO_INIT
 	wait = 1
-	priority = SS_PRIORITY_CHAT
-	init_order = SS_INIT_CHAT
+	priority = FIRE_PRIORITY_CHAT
+	init_order = INIT_ORDER_CHAT

 	var/list/payload_by_client = list()

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(chemistry)
 	name = "Chemistry"
 	priority = SS_PRIORITY_CHEMISTRY
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	runlevels = RUNLEVELS_PLAYING
 	init_stage = INITSTAGE_EARLY

@@ -16,7 +16,7 @@

 SUBSYSTEM_DEF(discord)
 	name = "Discord"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_DISCORD
 	flags = SS_NO_FIRE | SS_NO_DISPLAY

 	var/list/channels_to_group = list()		// Group flag -> list of channel datums map.
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(docs)
 	name = "Documents"
 	wait = 30 SECONDS
 	flags = SS_NO_FIRE
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST

 	var/total_docs = 0
 	var/list/docs = list()
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(economy)
 	name = "Economy"
 	wait = 30 SECONDS
 	flags = SS_NO_FIRE
-	init_order = SS_INIT_ECONOMY
+	init_order = INIT_ORDER_ECONOMY
 	var/datum/money_account/station_account
 	var/list/department_accounts = list()
 	var/list/all_money_accounts = list()
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(fail2topic)
 	name = "Fail2Topic"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_BACKGROUND
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY | RUNLEVEL_INIT

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(ghostroles)
 	name = "Ghost Roles"
 	flags = SS_NO_FIRE
-	init_order = SS_INIT_GHOSTROLES
+	init_order = INIT_ORDER_GHOSTROLES

 	var/list/spawnpoints = list() //List of the available spawnpoints by spawnpoint type
 		// -> type 1 -> spawnpoint 1
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(icon_cache)
 	name = "Icon Cache"
 	flags = SS_NO_FIRE
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST

 	// Cached bloody overlays, key is object type.
 	var/list/bloody_cache = list()
@@ -17,7 +17,7 @@

 SUBSYSTEM_DEF(icon_smooth)
 	name = "Icon Smoothing"
-	init_order = SS_INIT_SMOOTHING
+	init_order = INIT_ORDER_ICON_SMOOTHING
 	wait = 1
 	priority = SS_PRIORITY_SMOOTHING
 	flags = SS_TICKER
@@ -3,7 +3,7 @@ SUBSYSTEM_DEF(icon_update)
 	wait = 1	// ticks
 	flags = SS_TICKER
 	priority = SS_PRIORITY_ICON_UPDATE
-	init_order = SS_INIT_ICON_UPDATE
+	init_order = INIT_ORDER_ICON_UPDATE

 	/**
 	 * Associative list of atoms -> callback params
@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(atlas)
 	name = "Atlas"
 	flags = SS_NO_FIRE
-	init_order = SS_INIT_MAPLOAD
+	init_order = INIT_ORDER_MAPPING
 	init_stage = INITSTAGE_EARLY

 	// Whatever map is currently loaded. Null until SSatlas Initialize() starts.
@@ -1,7 +1,7 @@
 #define SUBSYSTEM_INIT_SOURCE "subsystem init"
 SUBSYSTEM_DEF(atoms)
 	name = "Atoms"
-	init_order = SS_INIT_ATOMS
+	init_order = INIT_ORDER_ATOMS
 	flags = SS_NO_FIRE

 	/// A stack of list(source, desired initialized state)
@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(finalize)
 	name = "Map Finalization"
 	flags = SS_NO_FIRE | SS_NO_DISPLAY
-	init_order = SS_INIT_MAPFINALIZE
+	init_order = INIT_ORDER_MAPFINALIZE

 	var/dmm_suite/maploader
 	var/datum/away_mission/selected_mission
@@ -3,7 +3,7 @@

 SUBSYSTEM_DEF(misc_early)
 	name = "Early Miscellaneous Init"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_NO_FIRE | SS_NO_DISPLAY

 /datum/controller/subsystem/misc_early/Initialize(timeofday)
@@ -2,7 +2,7 @@

 SUBSYSTEM_DEF(misc_late)
 	name = "Late Miscellaneous Init"
-	init_order = SS_INIT_MISC
+	init_order = INIT_ORDER_MISC
 	flags = SS_NO_FIRE | SS_NO_DISPLAY

 	/// this is a list of things that fire when late misc init is called
@@ -1,6 +1,7 @@
 SUBSYSTEM_DEF(persistent_configuration)
 	name = "Persistent Configuration"
-	init_order = SS_INIT_PERSISTENT_CONFIG
+	init_order = INIT_ORDER_PERSISTENT_CONFIGURATION
+	init_stage = INITSTAGE_EARLY
 	flags = SS_NO_FIRE

 // Config options go here. Make sure to give them sane default values!
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(ipintel)
 	name = "XKeyScore"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_NO_FIRE
 	var/enabled = FALSE //disable at round start to avoid checking reconnects
 	var/throttle = 0
@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(jobs)
 	// Subsystem stuff.
 	name = "Jobs"
 	flags = SS_NO_FIRE
-	init_order = SS_INIT_JOBS
+	init_order = INIT_ORDER_JOBS

 	// Vars.
 	var/list/datum/job/occupations = list()
@@ -7,7 +7,7 @@ SUBSYSTEM_DEF(lighting)
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY

 	priority = SS_PRIORITY_LIGHTING
-	init_order = SS_INIT_LIGHTING
+	init_order = INIT_ORDER_LIGHTING

 	var/total_lighting_overlays = 0
 	var/total_lighting_sources = 0
@@ -36,7 +36,7 @@ if(Datum.isprocessing) {\
 SUBSYSTEM_DEF(machinery)
 	name = "Machinery"
 	priority = SS_PRIORITY_MACHINERY
-	init_order = SS_INIT_MACHINERY
+	init_order = INIT_ORDER_MACHINES
 	flags = SS_POST_FIRE_TIMING
 	wait = 2 SECONDS

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(mapping)
 	name = "Mapping"
-	init_order = SS_INIT_AWAY_MAPS
+	init_order = INIT_ORDER_AWAY_MAPS
 	flags = SS_NO_FIRE

 	var/list/map_templates = list()
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(materials)
 	name = "Materials"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_NO_FIRE

 	var/list/materials
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(mobs)
 	name = "Mobs - Life"
-	init_order = SS_INIT_MISC	// doesn't really matter when we init
+	init_order = INIT_ORDER_MISC	// doesn't really matter when we init
 	priority = SS_PRIORITY_MOB
 	runlevels = RUNLEVELS_PLAYING

@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(overlays)
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 	wait = 1
 	priority = SS_PRIORITY_OVERLAY
-	init_order = SS_INIT_OVERLAY
+	init_order = INIT_ORDER_OVERLAY

 	var/list/processing = list()

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(pai)
 	name = "pAI"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_NO_FIRE | SS_NO_INIT

 	var/list/pai_software_by_key
@@ -1,12 +1,10 @@
 SUBSYSTEM_DEF(ping)
 	name = "Ping"
-	priority = SS_PRIORITY_PING
-	init_order = SS_INIT_PING
+	priority = FIRE_PRIORITY_PING
+	init_stage = INITSTAGE_EARLY
 	wait = 4 SECONDS
 	flags = SS_NO_INIT
-	runlevels = RUNLEVEL_INIT | RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME
-	init_stage = INITSTAGE_EARLY
-
+	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	var/list/currentrun = list()

 /datum/controller/subsystem/ping/stat_entry(msg)
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(plants)
 	name = "Seeds & Plants"
 	flags = 0	// Override parent's flags.
 	wait = 75
-	init_order = SS_INIT_SEEDS
+	init_order = INIT_ORDER_SEEDS
 	priority = SS_PRIORITY_PLANTS
 	runlevels = RUNLEVELS_PLAYING

@@ -6,7 +6,7 @@ PROCESSING_SUBSYSTEM_DEF(electronics)
 	wait = 2 SECONDS
 	priority = SS_PRIORITY_ELECTRONICS
 	flags = SS_KEEP_TIMING
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST

 	var/list/all_integrated_circuits = list()
 	var/list/printer_recipe_list = list()
@@ -4,7 +4,7 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
 PROCESSING_SUBSYSTEM_DEF(ntsl2)
 	name = "NTSL2"
 	flags = 0
-	init_order = SS_INIT_MISC
+	init_order = INIT_ORDER_MISC
 	// priority = SS_PRIORITY_PROCESSING
 	var/connected = FALSE
 	var/list/programs = list()
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(shuttle)
 	name = "Shuttle"
 	wait = 2 SECONDS
 	priority = SS_PRIORITY_SHUTTLE
-	init_order = SS_INIT_MISC                    //Should be initialized after all maploading is over and atoms are initialized, to ensure that landmarks have been initialized.
+	init_order = INIT_ORDER_MISC                    //Should be initialized after all maploading is over and atoms are initialized, to ensure that landmarks have been initialized.

 	var/overmap_halted = FALSE                   //Whether ships can move on the overmap; used for adminbus.
 	var/list/ships = list()                      //List of all ships.
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(skybox)
 	name = "Space skybox"
-	init_order = SS_INIT_PARALLAX
+	init_order = INIT_ORDER_PARALLAX
 	flags = SS_NO_FIRE
 	var/background_color
 	var/skybox_icon = 'icons/skybox/skybox.dmi' //Path to our background. Lets us use anything we damn well please. Skyboxes need to be 736x736
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(stickyban)
 	name = "PRISM"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_NO_FIRE

 	var/list/cache = list()
@@ -12,7 +12,7 @@ var/datum/controller/subsystem/ticker/SSticker

 	priority = SS_PRIORITY_TICKER
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
-	init_order = SS_INIT_LOBBY
+	init_order = INIT_ORDER_TICKER

 	wait = 1 SECOND

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(virtualreality)
 	name = "Virtual Reality"
-	init_order = SS_INIT_MISC_FIRST
+	init_order = INIT_ORDER_MISC_FIRST
 	flags = SS_NO_FIRE

 	// MECHA
@@ -1,9 +1,9 @@
 SUBSYSTEM_DEF(vote)
 	name = "Voting"
 	wait = 1 SECOND
-	flags = SS_KEEP_TIMING | SS_KEEP_TIMING
-	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
-	priority = SS_PRIORITY_VOTE
+	flags = SS_KEEP_TIMING
+	init_order = INIT_ORDER_VOTE
+	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT

 	var/next_transfer_time

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(zcopy)
 	name = "Z-Copy"
 	wait = 1
-	init_order = SS_INIT_ZCOPY
+	init_order = INIT_ORDER_ZCOPY
 	priority = SS_PRIORITY_ZCOPY
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY