From 667c3c4c13125d70b2b0afb39e5559e06bd577bd Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Fri, 3 Jan 2025 13:52:05 -0700
Subject: [PATCH] [MIRROR] Subsystem return update (#9774)

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 .../dcs/{signals_ch => signals}/signals_subsystem.dm |  0
 code/__defines/subsystems.dm                         |  4 ++--
 code/controllers/master.dm                           | 12 ++++--------
 code/controllers/subsystem.dm                        |  2 --
 code/controllers/subsystems/air.dm                   |  9 ++++-----
 code/controllers/subsystems/alarm.dm                 |  2 +-
 code/controllers/subsystems/atoms.dm                 |  4 ++--
 code/controllers/subsystems/character_setup.dm       |  2 +-
 code/controllers/subsystems/chemistry.dm             |  2 +-
 code/controllers/subsystems/circuits.dm              |  4 ++--
 code/controllers/subsystems/events.dm                |  2 +-
 code/controllers/subsystems/game_master.dm           |  2 +-
 code/controllers/subsystems/holomaps.dm              |  4 ++--
 code/controllers/subsystems/input.dm                 |  2 +-
 code/controllers/subsystems/job.dm                   |  5 ++---
 code/controllers/subsystems/lighting.dm              |  4 ++--
 code/controllers/subsystems/machines.dm              |  4 ++--
 code/controllers/subsystems/mapping.dm               |  4 ++--
 code/controllers/subsystems/media_tracks.dm          |  4 ++--
 code/controllers/subsystems/nightshift.dm            |  2 +-
 code/controllers/subsystems/overlays.dm              |  1 -
 code/controllers/subsystems/overmap_renamer_vr.dm    |  6 ++++--
 code/controllers/subsystems/persistence.dm           |  2 --
 code/controllers/subsystems/planets.dm               |  4 ++--
 code/controllers/subsystems/plants.dm                |  2 --
 code/controllers/subsystems/player_tips.dm           |  4 +---
 .../controllers/subsystems/processing/fastprocess.dm |  2 +-
 .../controllers/subsystems/processing/instruments.dm |  2 +-
 code/controllers/subsystems/processing/turfs.dm      |  2 +-
 code/controllers/subsystems/robot_sprites.dm         |  2 +-
 code/controllers/subsystems/server_maint.dm          |  2 +-
 code/controllers/subsystems/shuttles.dm              |  4 ++--
 code/controllers/subsystems/skybox.dm                |  2 +-
 code/controllers/subsystems/sounds.dm                |  2 +-
 code/controllers/subsystems/sqlite.dm                |  4 ++--
 code/controllers/subsystems/sun.dm                   |  2 +-
 code/controllers/subsystems/supply.dm                |  2 +-
 code/controllers/subsystems/ticker.dm                |  2 +-
 code/controllers/subsystems/transcore_vr.dm          |  2 +-
 code/controllers/subsystems/vis_overlays.dm          |  2 +-
 code/controllers/subsystems/webhooks.dm              |  2 +-
 code/controllers/subsystems/xenoarch.dm              |  4 ++--
 vorestation.dme                                      |  2 +-
 43 files changed, 60 insertions(+), 73 deletions(-)
 rename code/__defines/dcs/{signals_ch => signals}/signals_subsystem.dm (100%)

diff --git a/code/__defines/dcs/signals_ch/signals_subsystem.dm b/code/__defines/dcs/signals/signals_subsystem.dm
similarity index 100%
rename from code/__defines/dcs/signals_ch/signals_subsystem.dm
rename to code/__defines/dcs/signals/signals_subsystem.dm
diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm
index daa0c2bc2c..b631b47df5 100644
--- a/code/__defines/subsystems.dm
+++ b/code/__defines/subsystems.dm
@@ -205,5 +205,5 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G
 */
 #define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__)
 
-/// The timer key used to know how long subsystem initialization takes // CHOMPEdit
-#define SS_INIT_TIMER_KEY "ss_init" // CHOMPEdit
+/// The timer key used to know how long subsystem initialization takes
+#define SS_INIT_TIMER_KEY "ss_init"
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 84563d299b..feb78c01f5 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -54,11 +54,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 
 	var/current_runlevel //!for scheduling different subsystems for different stages of the round
 
-	// CHOMPEdit Start
 	/// During initialization, will be the instanced subsytem that is currently initializing.
 	/// Outside of initialization, returns null.
 	var/current_initializing_subsystem = null
-	// CHOMPEdit End
 
 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
@@ -204,10 +202,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	for (var/datum/controller/subsystem/SS in subsystems)
 		if (SS.flags & SS_NO_INIT)
 			continue
-		//SS.Initialize(REALTIMEOFDAY) // CHOMPEdit
-		init_subsystem(SS) // CHOMPEdit
+		init_subsystem(SS)
 		CHECK_TICK
-	current_initializing_subsystem = null // CHOMPEdit
+	current_initializing_subsystem = null
 	current_ticklimit = TICK_LIMIT_RUNNING
 	var/time = (REALTIMEOFDAY - start_timeofday) / 10
 
@@ -216,7 +213,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	log_world(msg)
 
 
-	send2chat("Server Initialization completed! - Took [time] second[time == 1 ? "" : "s"].", "bot announce")
+	// FIXME: TGS <-> Discord communication; sending message to a TGS chat channel
+	send2chat("Server Initialization completed! - Took [time] second[time == 1 ? "" : "s"].", "bot announce") // CHOMPEnable
 
 	if (!current_runlevel)
 		SetRunLevel(RUNLEVEL_LOBBY)
@@ -238,7 +236,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	// Loop.
 	Master.StartProcessing(0)
 
-// CHOMPEdit Start
 /**
  * Initialize a given subsystem and handle the results.
  *
@@ -312,7 +309,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 
 	to_chat(world, chat_message)
 	log_world(message)
-// CHOMPEdit End
 
 /datum/controller/master/proc/SetRunLevel(new_runlevel)
 	var/old_runlevel = isnull(current_runlevel) ? "NULL" : runlevel_flags[current_runlevel]
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index 1badd0a453..3e5e269057 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -227,13 +227,11 @@
 /// Called after the config has been loaded or reloaded.
 /datum/controller/subsystem/proc/OnConfigLoad()
 
-// CHOMPEdit Start
 /**
  * Used to initialize the subsystem. This is expected to be overriden by subtypes.
  */
 /datum/controller/subsystem/Initialize()
 	return SS_INIT_NONE
-// CHOMPEdit End
 
 //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
 /datum/controller/subsystem/stat_entry(msg)
diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm
index 7fac0bd3b5..b2410a8432 100644
--- a/code/controllers/subsystems/air.dm
+++ b/code/controllers/subsystems/air.dm
@@ -102,8 +102,8 @@ SUBSYSTEM_DEF(air)
 	var/current_cycle = 0
 	var/next_id = 1 //Used to keep track of zone UIDs.
 
-/datum/controller/subsystem/air/Initialize() // CHOMPEdit
-	var/start_timeofday = REALTIMEOFDAY // CHOMPEdit
+/datum/controller/subsystem/air/Initialize()
+	var/start_timeofday = REALTIMEOFDAY
 	report_progress("Processing Geometry...")
 
 	current_cycle = 0
@@ -113,8 +113,7 @@ SUBSYSTEM_DEF(air)
 		S.update_air_properties()
 		CHECK_TICK
 
-	// CHOMPEdit
-	admin_notice(span_danger("Geometry initialized in [round(0.1*(REALTIMEOFDAY-start_timeofday),0.1)](?) seconds.") + \
+	admin_notice(span_danger("Geometry initialized in [round(0.1*(REALTIMEOFDAY-start_timeofday),0.1)] seconds.") + \
 span_info("<br>\
 Total Simulated Turfs: [simulated_turf_count]<br>\
 Total Zones: [zones.len]<br>\
@@ -169,7 +168,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
 		log_debug("Active Edges on ZAS Startup\n" + edge_log.Join("\n"))
 		startup_active_edge_log = edge_log.Copy()
 
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/air/fire(resumed = 0)
 	var/timer
diff --git a/code/controllers/subsystems/alarm.dm b/code/controllers/subsystems/alarm.dm
index 3af3f8d334..25a28ca59e 100644
--- a/code/controllers/subsystems/alarm.dm
+++ b/code/controllers/subsystems/alarm.dm
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(alarm)
 
 /datum/controller/subsystem/alarm/Initialize()
 	all_handlers = list(atmosphere_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm)
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/alarm/fire(resumed = FALSE)
 	if(!resumed)
diff --git a/code/controllers/subsystems/atoms.dm b/code/controllers/subsystems/atoms.dm
index df59516e25..3918372ce3 100644
--- a/code/controllers/subsystems/atoms.dm
+++ b/code/controllers/subsystems/atoms.dm
@@ -17,13 +17,13 @@ SUBSYSTEM_DEF(atoms)
 
 	var/list/BadInitializeCalls = list()
 
-/datum/controller/subsystem/atoms/Initialize() // CHOMPEdit
+/datum/controller/subsystem/atoms/Initialize()
 	setupgenetics() //to set the mutations' place in structural enzymes, so initializers know where to put mutations.
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 	to_world_log("Initializing objects")
 	admin_notice(span_danger("Initializing objects"), R_DEBUG)
 	InitializeAtoms()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms)
 	if(initialized == INITIALIZATION_INSSATOMS)
diff --git a/code/controllers/subsystems/character_setup.dm b/code/controllers/subsystems/character_setup.dm
index 73c1bc613e..272cd0b8ab 100644
--- a/code/controllers/subsystems/character_setup.dm
+++ b/code/controllers/subsystems/character_setup.dm
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(character_setup)
 	name = "Character Setup"
 	init_order = INIT_ORDER_DEFAULT
 	priority = FIRE_PRIORITY_CHARSETUP
-	flags = SS_BACKGROUND | SS_NO_INIT // CHOMPEdit
+	flags = SS_BACKGROUND | SS_NO_INIT
 	wait = 1 SECOND
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 
diff --git a/code/controllers/subsystems/chemistry.dm b/code/controllers/subsystems/chemistry.dm
index 5e44c91756..f31441e34c 100644
--- a/code/controllers/subsystems/chemistry.dm
+++ b/code/controllers/subsystems/chemistry.dm
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(chemistry)
 /datum/controller/subsystem/chemistry/Initialize()
 	initialize_chemical_reagents()
 	initialize_chemical_reactions()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/chemistry/stat_entry(msg)
 	msg = "C: [chemical_reagents.len] | R: [chemical_reactions.len]"
diff --git a/code/controllers/subsystems/circuits.dm b/code/controllers/subsystems/circuits.dm
index d7f73a051c..2e555b293d 100644
--- a/code/controllers/subsystems/circuits.dm
+++ b/code/controllers/subsystems/circuits.dm
@@ -17,9 +17,9 @@ SUBSYSTEM_DEF(circuit)
 /datum/controller/subsystem/circuit/Recover()
 	flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
 
-/datum/controller/subsystem/circuit/Initialize() // CHOMPEdit
+/datum/controller/subsystem/circuit/Initialize()
 	circuits_init()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/circuit/proc/circuits_init()
 	//Cached lists for free performance
diff --git a/code/controllers/subsystems/events.dm b/code/controllers/subsystems/events.dm
index 18ee69cbad..2e91ad3b15 100644
--- a/code/controllers/subsystems/events.dm
+++ b/code/controllers/subsystems/events.dm
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(events)
 		)
 	if(global.using_map.use_overmap)
 		GLOB.overmap_event_handler.create_events(global.using_map.overmap_z, global.using_map.overmap_size, global.using_map.overmap_event_areas)
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/events/fire(resumed)
 	if (!resumed)
diff --git a/code/controllers/subsystems/game_master.dm b/code/controllers/subsystems/game_master.dm
index 1da1836f05..7aa2256378 100644
--- a/code/controllers/subsystems/game_master.dm
+++ b/code/controllers/subsystems/game_master.dm
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(game_master)
 	if(config && !CONFIG_GET(flag/enable_game_master)) // CHOMPEdit
 		can_fire = FALSE
 
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/game_master/fire(resumed)
 	adjust_staleness(1)
diff --git a/code/controllers/subsystems/holomaps.dm b/code/controllers/subsystems/holomaps.dm
index 79571d8311..e3faf75f89 100644
--- a/code/controllers/subsystems/holomaps.dm
+++ b/code/controllers/subsystems/holomaps.dm
@@ -14,9 +14,9 @@ SUBSYSTEM_DEF(holomaps)
 /datum/controller/subsystem/holomaps/Recover()
 	flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
 
-/datum/controller/subsystem/holomaps/Initialize() // CHOMPEdit
+/datum/controller/subsystem/holomaps/Initialize()
 	generateHoloMinimaps()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/holomaps/stat_entry(msg)
 	if (!Debug2)
diff --git a/code/controllers/subsystems/input.dm b/code/controllers/subsystems/input.dm
index 88f010f9b0..70d1f9cda6 100644
--- a/code/controllers/subsystems/input.dm
+++ b/code/controllers/subsystems/input.dm
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(input)
 	name = "Input"
 	wait = 1 // SS_TICKER means this runs every tick
 	init_order = INIT_ORDER_INPUT
-	flags = SS_TICKER | SS_NO_INIT // CHOMPEdit
+	flags = SS_TICKER | SS_NO_INIT
 	priority = FIRE_PRIORITY_INPUT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 
diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index 3e5a5641e6..a6b88ea7ac 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -14,8 +14,7 @@ SUBSYSTEM_DEF(job)
 	var/list/shift_keys = list()				// CHOMPadd
 	var/list/restricted_keys = list()			// CHOMPadd
 
-
-/datum/controller/subsystem/job/Initialize() // CHOMPEdit
+/datum/controller/subsystem/job/Initialize()
 	if(!department_datums.len)
 		setup_departments()
 	if(!occupations.len)
@@ -24,7 +23,7 @@ SUBSYSTEM_DEF(job)
 	if(CONFIG_GET(number/job_camp_time_limit))
 		load_camp_lists()
 	//CHOMPadd end
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/job/proc/setup_occupations(faction = FACTION_STATION)
 	occupations = list()
diff --git a/code/controllers/subsystems/lighting.dm b/code/controllers/subsystems/lighting.dm
index 4f287f10cc..0f3c1c1cc7 100644
--- a/code/controllers/subsystems/lighting.dm
+++ b/code/controllers/subsystems/lighting.dm
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(lighting)
 	return ..()
 
 
-/datum/controller/subsystem/lighting/Initialize() // CHOMPEdit
+/datum/controller/subsystem/lighting/Initialize()
 	if(!subsystem_initialized)
 		if (CONFIG_GET(flag/starlight))
 			for(var/area/A in world)
@@ -37,7 +37,7 @@ SUBSYSTEM_DEF(lighting)
 	fire(FALSE, TRUE)
 	sunlight_queue_active += sunlight_queue + sunlight_queue //CHOMPEdit Run through shandler's twice during lobby wait to get some initial computation out of the way. After these two, the sunlight system will run MUCH faster.
 
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/lighting/fire(resumed, init_tick_checks)
 	MC_SPLIT_TICK_INIT(4)
diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm
index e37706a57d..c9371c9b71 100644
--- a/code/controllers/subsystems/machines.dm
+++ b/code/controllers/subsystems/machines.dm
@@ -30,12 +30,12 @@ SUBSYSTEM_DEF(machines)
 	var/list/powernets = list()
 	var/list/powerobjs = list()
 
-/datum/controller/subsystem/machines/Initialize() // CHOMPEdit
+/datum/controller/subsystem/machines/Initialize()
 	makepowernets()
 	admin_notice(span_danger("Initializing atmos machinery."), R_DEBUG)
 	setup_atmos_machinery(all_machines)
 	fire()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/machines/fire(resumed = 0)
 	var/timer = TICK_USAGE
diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm
index 3be7bf6022..1985efb978 100644
--- a/code/controllers/subsystems/mapping.dm
+++ b/code/controllers/subsystems/mapping.dm
@@ -12,7 +12,7 @@ SUBSYSTEM_DEF(mapping)
 	flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
 	shelter_templates = SSmapping.shelter_templates
 
-/datum/controller/subsystem/mapping/Initialize() // CHOMPEdit
+/datum/controller/subsystem/mapping/Initialize()
 	if(subsystem_initialized)
 		return
 	world.max_z_changed() // This is to set up the player z-level list, maxz hasn't actually changed (probably)
@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(mapping)
 	// Lateload Code related to Expedition areas.
 	if(using_map) // VOREStation Edit: Re-enable this.
 		loadLateMaps()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/mapping/proc/load_map_templates()
 	for(var/datum/map_template/template as anything in subtypesof(/datum/map_template))
diff --git a/code/controllers/subsystems/media_tracks.dm b/code/controllers/subsystems/media_tracks.dm
index f43eb4d6d0..ddca32fabc 100644
--- a/code/controllers/subsystems/media_tracks.dm
+++ b/code/controllers/subsystems/media_tracks.dm
@@ -13,10 +13,10 @@ SUBSYSTEM_DEF(media_tracks)
 	var/list/casino_tracks = list()
 	/// CHOMPstation edit end
 
-/datum/controller/subsystem/media_tracks/Initialize() // CHOMPEdit
+/datum/controller/subsystem/media_tracks/Initialize()
 	load_tracks()
 	sort_tracks()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/media_tracks/proc/load_tracks()
 	for(var/filename in CONFIG_GET(str_list/jukebox_track_files))
diff --git a/code/controllers/subsystems/nightshift.dm b/code/controllers/subsystems/nightshift.dm
index fa1d626e6d..c91db54866 100644
--- a/code/controllers/subsystems/nightshift.dm
+++ b/code/controllers/subsystems/nightshift.dm
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(nightshift)
 	if(config.randomize_shift_time)
 		GLOB.gametime_offset = rand(0, 23) HOURS
 	*/
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/nightshift/fire(resumed = FALSE)
 	if(round_duration_in_ds < nightshift_first_check)
diff --git a/code/controllers/subsystems/overlays.dm b/code/controllers/subsystems/overlays.dm
index 108866a302..ae66d3d09f 100644
--- a/code/controllers/subsystems/overlays.dm
+++ b/code/controllers/subsystems/overlays.dm
@@ -29,7 +29,6 @@ SUBSYSTEM_DEF(overlays)
 		atom.flags &= ~OVERLAY_QUEUED
 		CHECK_TICK
 
-//CHOMPEdit Begin
 /datum/controller/subsystem/overlays/Initialize()
 	fire(FALSE, TRUE)
 	return SS_INIT_SUCCESS
diff --git a/code/controllers/subsystems/overmap_renamer_vr.dm b/code/controllers/subsystems/overmap_renamer_vr.dm
index fc750f5414..d82aadbfcb 100644
--- a/code/controllers/subsystems/overmap_renamer_vr.dm
+++ b/code/controllers/subsystems/overmap_renamer_vr.dm
@@ -8,9 +8,11 @@ SUBSYSTEM_DEF(overmap_renamer)
 	runlevels = RUNLEVEL_INIT
 	flags = SS_NO_FIRE
 
-/datum/controller/subsystem/overmap_renamer/Initialize() // CHOMPEdit
+
+
+/datum/controller/subsystem/overmap_renamer/Initialize()
 	update_names()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /*Shouldn't be a switch statement. We want ALL of the if(map_template.name in visitable_z_leves_name_list) to fire
 if we end up with multiple renamable lateload overmap objects.*/
diff --git a/code/controllers/subsystems/persistence.dm b/code/controllers/subsystems/persistence.dm
index b9ffd2de0c..69a92f14e2 100644
--- a/code/controllers/subsystems/persistence.dm
+++ b/code/controllers/subsystems/persistence.dm
@@ -10,7 +10,6 @@ SUBSYSTEM_DEF(persistence)
 	var/list/all_paintings = list()
 	var/list/unpicked_paintings = list()
 
-// CHOMPEdit Start
 /datum/controller/subsystem/persistence/Initialize()
 	for(var/datum/persistent/P as anything in subtypesof(/datum/persistent))
 		if(initial(P.name))
@@ -18,7 +17,6 @@ SUBSYSTEM_DEF(persistence)
 			persistence_datums[P.type] = P
 			P.Initialize()
 	return SS_INIT_SUCCESS
-// CHOMPEdit End
 
 /datum/controller/subsystem/persistence/Shutdown()
 	for(var/thing in persistence_datums)
diff --git a/code/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm
index c82f124064..d413626c4c 100644
--- a/code/controllers/subsystems/planets.dm
+++ b/code/controllers/subsystems/planets.dm
@@ -14,10 +14,10 @@ SUBSYSTEM_DEF(planets)
 	var/static/list/needs_sun_update = list()
 	var/static/list/needs_temp_update = list()
 
-/datum/controller/subsystem/planets/Initialize() // CHOMPEdit
+/datum/controller/subsystem/planets/Initialize()
 	admin_notice(span_danger("Initializing planetary weather."), R_DEBUG)
 	createPlanets()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/planets/proc/createPlanets()
 	var/list/planet_datums = using_map.planet_datums_to_make
diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm
index 9843fe8b11..f4e0e3985c 100644
--- a/code/controllers/subsystems/plants.dm
+++ b/code/controllers/subsystems/plants.dm
@@ -26,11 +26,9 @@ SUBSYSTEM_DEF(plants)
 	msg = "P:[processing.len]|S:[seeds.len]"
 	return ..()
 
-//CHOMPEdit Begin
 /datum/controller/subsystem/plants/Initialize()
 	setup()
 	return SS_INIT_SUCCESS
-//CHOMPEdit End
 
 // Predefined/roundstart varieties use a string key to make it
 // easier to grab the new variety when mutating. Post-roundstart
diff --git a/code/controllers/subsystems/player_tips.dm b/code/controllers/subsystems/player_tips.dm
index adfab4db0c..8afa6cc5b5 100644
--- a/code/controllers/subsystems/player_tips.dm
+++ b/code/controllers/subsystems/player_tips.dm
@@ -1,6 +1,4 @@
-/*
-Player tips procs and lists are defined under /code/modules/player_tips_vr
-*/
+/// Player tips procs and lists are defined under /code/modules/player_tips_vr
 SUBSYSTEM_DEF(player_tips)
 	name = "Periodic Player Tips"
 	priority = FIRE_PRIORITY_PLAYERTIPS
diff --git a/code/controllers/subsystems/processing/fastprocess.dm b/code/controllers/subsystems/processing/fastprocess.dm
index 384fc78e9e..407477f9b0 100644
--- a/code/controllers/subsystems/processing/fastprocess.dm
+++ b/code/controllers/subsystems/processing/fastprocess.dm
@@ -4,7 +4,7 @@ PROCESSING_SUBSYSTEM_DEF(fastprocess)
 	name = "Fast Processing"
 	wait = 2
 	stat_tag = "FP"
-	flags = SS_NO_INIT // CHOMPEdit
+	flags = SS_NO_INIT
 
 /datum/controller/subsystem/processing/fastprocess/Recover()
 	log_debug("[name] subsystem Recover().")
diff --git a/code/controllers/subsystems/processing/instruments.dm b/code/controllers/subsystems/processing/instruments.dm
index 86c4eed871..e3a4802f11 100644
--- a/code/controllers/subsystems/processing/instruments.dm
+++ b/code/controllers/subsystems/processing/instruments.dm
@@ -24,7 +24,7 @@ PROCESSING_SUBSYSTEM_DEF(instruments)
 /datum/controller/subsystem/processing/instruments/Initialize()
 	initialize_instrument_data()
 	synthesizer_instrument_ids = get_allowed_instrument_ids()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/processing/instruments/proc/on_song_new(datum/song/S)
 	songs += S
diff --git a/code/controllers/subsystems/processing/turfs.dm b/code/controllers/subsystems/processing/turfs.dm
index a451eed1e9..509ec4f17b 100644
--- a/code/controllers/subsystems/processing/turfs.dm
+++ b/code/controllers/subsystems/processing/turfs.dm
@@ -1,7 +1,7 @@
 PROCESSING_SUBSYSTEM_DEF(turfs)
 	name = "Turf Processing"
 	wait = 20
-	flags = SS_NO_INIT // CHOMPEdit
+	flags = SS_NO_INIT
 
 /datum/controller/subsystem/processing/turfs/Recover()
 	log_debug("[name] subsystem Recover().")
diff --git a/code/controllers/subsystems/robot_sprites.dm b/code/controllers/subsystems/robot_sprites.dm
index b90fb34b0a..d6d38ab50f 100644
--- a/code/controllers/subsystems/robot_sprites.dm
+++ b/code/controllers/subsystems/robot_sprites.dm
@@ -8,7 +8,7 @@ SUBSYSTEM_DEF(robot_sprites)
 
 /datum/controller/subsystem/robot_sprites/Initialize()
 	initialize_borg_sprites()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/robot_sprites/proc/initialize_borg_sprites()
 
diff --git a/code/controllers/subsystems/server_maint.dm b/code/controllers/subsystems/server_maint.dm
index 1ac5b85c70..20cd2760db 100644
--- a/code/controllers/subsystems/server_maint.dm
+++ b/code/controllers/subsystems/server_maint.dm
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(server_maint)
 /*/datum/controller/subsystem/server_maint/PreInit()
 	world.hub_password = "" *///quickly! before the hubbies see us.
 
-/datum/controller/subsystem/server_maint/Initialize() // CHOMPEdit
+/datum/controller/subsystem/server_maint/Initialize()
 	if (fexists("tmp/"))
 		fdel("tmp/")
 	//if (CONFIG_GET(flag/hub))
diff --git a/code/controllers/subsystems/shuttles.dm b/code/controllers/subsystems/shuttles.dm
index 121d2925f5..ebd4cdcc5c 100644
--- a/code/controllers/subsystems/shuttles.dm
+++ b/code/controllers/subsystems/shuttles.dm
@@ -32,7 +32,7 @@ SUBSYSTEM_DEF(shuttles)
 
 	var/tmp/list/current_run                       // Shuttles remaining to process this fire() tick
 
-/datum/controller/subsystem/shuttles/Initialize() // CHOMPEdit
+/datum/controller/subsystem/shuttles/Initialize()
 	last_landmark_registration_time = world.time
 	// Find all declared shuttle datums and initailize them. (Okay, queue them for initialization a few lines further down)
 	for(var/shuttle_type in subtypesof(/datum/shuttle)) // This accounts for most shuttles, though away maps can queue up more.
@@ -43,7 +43,7 @@ SUBSYSTEM_DEF(shuttles)
 			LAZYDISTINCTADD(shuttles_to_initialize, shuttle_type)
 	block_init_queue = FALSE
 	process_init_queues()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/shuttles/fire(resumed = 0)
 	if (!resumed)
diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm
index 4d4c53e852..a1f6dcf11a 100644
--- a/code/controllers/subsystems/skybox.dm
+++ b/code/controllers/subsystems/skybox.dm
@@ -90,7 +90,7 @@ SUBSYSTEM_DEF(skybox)
 	. = ..()
 
 /datum/controller/subsystem/skybox/Initialize()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/skybox/proc/get_skybox(z)
 	if(!subsystem_initialized)
diff --git a/code/controllers/subsystems/sounds.dm b/code/controllers/subsystems/sounds.dm
index 17d3c560ca..9067c077da 100644
--- a/code/controllers/subsystems/sounds.dm
+++ b/code/controllers/subsystems/sounds.dm
@@ -25,7 +25,7 @@ SUBSYSTEM_DEF(sounds)
 
 /datum/controller/subsystem/sounds/Initialize()
 	setup_available_channels()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/sounds/proc/setup_available_channels()
 	channel_list = list()
diff --git a/code/controllers/subsystems/sqlite.dm b/code/controllers/subsystems/sqlite.dm
index c771ee5ffe..a2e9b2864a 100644
--- a/code/controllers/subsystems/sqlite.dm
+++ b/code/controllers/subsystems/sqlite.dm
@@ -7,11 +7,11 @@ SUBSYSTEM_DEF(sqlite)
 	flags = SS_NO_FIRE
 	var/database/sqlite_db = null
 
-/datum/controller/subsystem/sqlite/Initialize() // CHOMPEdit
+/datum/controller/subsystem/sqlite/Initialize()
 	connect()
 	if(sqlite_db)
 		init_schema(sqlite_db)
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/sqlite/proc/connect()
 	if(!CONFIG_GET(flag/sqlite_enabled))
diff --git a/code/controllers/subsystems/sun.dm b/code/controllers/subsystems/sun.dm
index f0c484273e..bedb33ed13 100644
--- a/code/controllers/subsystems/sun.dm
+++ b/code/controllers/subsystems/sun.dm
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(sun)
 	name = "Sun"
 	wait = 600
-	flags = SS_NO_INIT // CHOMPEdit
+	flags = SS_NO_INIT
 	var/static/datum/sun/sun = new
 
 /datum/controller/subsystem/sun/fire()
diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index 854856711d..b5fd09b8dc 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -33,7 +33,7 @@ SUBSYSTEM_DEF(supply)
 		else
 			qdel(P)
 
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 // Supply shuttle ticker - handles supply point regeneration. Just add points over time.
 /datum/controller/subsystem/supply/fire()
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 59b0c1dc73..582299d84d 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -61,7 +61,7 @@ var/global/datum/controller/subsystem/ticker/ticker
 		)
 	)
 	GLOB.autospeaker = new (null, null, null, 1) //Set up Global Announcer
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/ticker/fire(resumed = FALSE)
 	switch(current_state)
diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm
index 042b55a29b..5d4060c149 100644
--- a/code/controllers/subsystems/transcore_vr.dm
+++ b/code/controllers/subsystems/transcore_vr.dm
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(transcore)
 			warning("Instantiated transcore DB without a key: [t]")
 			continue
 		databases[db.key] = db
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/transcore/fire(resumed = 0)
 	var/timer = TICK_USAGE
diff --git a/code/controllers/subsystems/vis_overlays.dm b/code/controllers/subsystems/vis_overlays.dm
index 298fff21ed..61cb58170a 100644
--- a/code/controllers/subsystems/vis_overlays.dm
+++ b/code/controllers/subsystems/vis_overlays.dm
@@ -9,7 +9,7 @@ SUBSYSTEM_DEF(vis_overlays)
 
 /datum/controller/subsystem/vis_overlays/Initialize()
 	vis_overlay_cache = list()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/vis_overlays/fire(resumed = FALSE)
 	if(!resumed)
diff --git a/code/controllers/subsystems/webhooks.dm b/code/controllers/subsystems/webhooks.dm
index 7bb60aa3e6..a47e8933d9 100644
--- a/code/controllers/subsystems/webhooks.dm
+++ b/code/controllers/subsystems/webhooks.dm
@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(webhooks)
 
 /datum/controller/subsystem/webhooks/Initialize()
 	load_webhooks()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/webhooks/proc/load_webhooks()
 
diff --git a/code/controllers/subsystems/xenoarch.dm b/code/controllers/subsystems/xenoarch.dm
index 54ea0f88aa..7f6ea72f4a 100644
--- a/code/controllers/subsystems/xenoarch.dm
+++ b/code/controllers/subsystems/xenoarch.dm
@@ -14,9 +14,9 @@ SUBSYSTEM_DEF(xenoarch)
 	var/list/artifact_spawning_turfs = list()
 	var/list/digsite_spawning_turfs = list()
 
-/datum/controller/subsystem/xenoarch/Initialize() // CHOMPEdit
+/datum/controller/subsystem/xenoarch/Initialize()
 	SetupXenoarch()
-	return SS_INIT_SUCCESS // CHOMPEdit
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/xenoarch/Recover()
 	if (istype(SSxenoarch.artifact_spawning_turfs))
diff --git a/vorestation.dme b/vorestation.dme
index 25ce0e591e..af79c8bc2c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -185,7 +185,7 @@
 #include "code\__defines\dcs\helpers.dm"
 #include "code\__defines\dcs\signals.dm"
 #include "code\__defines\dcs\signals_ch.dm"
-#include "code\__defines\dcs\signals_ch\signals_subsystem.dm"
+#include "code\__defines\dcs\signals\signals_subsystem.dm"
 #include "code\__defines\dcs\signals_ch\signals_mob\signals_mob_main_ch.dm"
 #include "code\__defines\traits\_traits.dm"
 #include "code\__defines\traits\declarations.dm"