From fb596bcdb36dadda2308f9f5635510fea597d85c Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Wed, 22 Mar 2017 14:52:21 -0400
Subject: [PATCH] _DEF

---
 code/__DEFINES/MC.dm                                 | 4 ++--
 code/controllers/subsystem/acid.dm                   | 2 +-
 code/controllers/subsystem/air.dm                    | 2 +-
 code/controllers/subsystem/assets.dm                 | 2 +-
 code/controllers/subsystem/atoms.dm                  | 2 +-
 code/controllers/subsystem/augury.dm                 | 2 +-
 code/controllers/subsystem/communications.dm         | 2 +-
 code/controllers/subsystem/disease.dm                | 2 +-
 code/controllers/subsystem/events.dm                 | 2 +-
 code/controllers/subsystem/fire_burning.dm           | 2 +-
 code/controllers/subsystem/garbage.dm                | 2 +-
 code/controllers/subsystem/icon_smooth.dm            | 2 +-
 code/controllers/subsystem/inbounds.dm               | 2 +-
 code/controllers/subsystem/ipintel.dm                | 2 +-
 code/controllers/subsystem/job.dm                    | 2 +-
 code/controllers/subsystem/lighting.dm               | 2 +-
 code/controllers/subsystem/machines.dm               | 2 +-
 code/controllers/subsystem/mapping.dm                | 2 +-
 code/controllers/subsystem/minimap.dm                | 2 +-
 code/controllers/subsystem/mobs.dm                   | 2 +-
 code/controllers/subsystem/npcpool.dm                | 2 +-
 code/controllers/subsystem/orbit.dm                  | 2 +-
 code/controllers/subsystem/pai.dm                    | 2 +-
 code/controllers/subsystem/parallax.dm               | 2 +-
 code/controllers/subsystem/persistence.dm            | 2 +-
 code/controllers/subsystem/ping.dm                   | 2 +-
 code/controllers/subsystem/processing/fastprocess.dm | 2 +-
 code/controllers/subsystem/processing/flightpacks.dm | 2 +-
 code/controllers/subsystem/processing/obj.dm         | 2 +-
 code/controllers/subsystem/processing/overlays.dm    | 2 +-
 code/controllers/subsystem/processing/processing.dm  | 2 +-
 code/controllers/subsystem/radio.dm                  | 2 +-
 code/controllers/subsystem/religion.dm               | 2 +-
 code/controllers/subsystem/server_maint.dm           | 2 +-
 code/controllers/subsystem/shuttle.dm                | 2 +-
 code/controllers/subsystem/spacedrift.dm             | 2 +-
 code/controllers/subsystem/squeak.dm                 | 2 +-
 code/controllers/subsystem/stickyban.dm              | 2 +-
 code/controllers/subsystem/sun.dm                    | 2 +-
 code/controllers/subsystem/tgui.dm                   | 2 +-
 code/controllers/subsystem/throwing.dm               | 2 +-
 code/controllers/subsystem/ticker.dm                 | 2 +-
 code/controllers/subsystem/time_track.dm             | 2 +-
 code/controllers/subsystem/timer.dm                  | 2 +-
 code/controllers/subsystem/title.dm                  | 2 +-
 code/controllers/subsystem/vote.dm                   | 2 +-
 code/controllers/subsystem/weather.dm                | 2 +-
 47 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm
index cd1f9ec1be8..cdb81476104 100644
--- a/code/__DEFINES/MC.dm
+++ b/code/__DEFINES/MC.dm
@@ -68,14 +68,14 @@
 //prevents distinguishing identical timers with the wait variable
 #define TIMER_NO_HASH_WAIT  0x10
 
-#define SUBSYSTEM(X) var/datum/controller/subsystem/##X/SS##X;\
+#define SUBSYSTEM_DEF(X) var/datum/controller/subsystem/##X/SS##X;\
 /datum/controller/subsystem/##X/New(){\
     NEW_SS_GLOBAL(SS##X);\
     ..();\
 }\
 /datum/controller/subsystem/##X
 
-#define PROCESSING_SUBSYSTEM(X) var/datum/controller/subsystem/processing/##X/SS##X;\
+#define PROCESSING_SUBSYSTEM_DEF(X) var/datum/controller/subsystem/processing/##X/SS##X;\
 /datum/controller/subsystem/processing/##X/New(){\
     NEW_SS_GLOBAL(SS##X);\
     ..();\
diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm
index 0c3e8799d44..e5a67ab7334 100644
--- a/code/controllers/subsystem/acid.dm
+++ b/code/controllers/subsystem/acid.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(acid)
+SUBSYSTEM_DEF(acid)
 	name = "Acid"
 	priority = 40
 	flags = SS_NO_INIT|SS_BACKGROUND
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 2c0c5622bf2..1d1a50667b7 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -6,7 +6,7 @@
 #define SSAIR_HOTSPOTS 6
 #define SSAIR_SUPERCONDUCTIVITY 7
 
-SUBSYSTEM(air)
+SUBSYSTEM_DEF(air)
 	name = "Air"
 	init_order = -1
 	priority = 20
diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm
index 4b67f536f2a..bb809d76a8f 100644
--- a/code/controllers/subsystem/assets.dm
+++ b/code/controllers/subsystem/assets.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(assets)
+SUBSYSTEM_DEF(assets)
 	name = "Assets"
 	init_order = -3
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index 9287500729e..188d52a51f7 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -2,7 +2,7 @@
 #define INITIALIZATION_INNEW_MAPLOAD 1	//New should call Initialize(TRUE)
 #define INITIALIZATION_INNEW_REGULAR 2	//New should call Initialize(FALSE)
 
-SUBSYSTEM(atoms)
+SUBSYSTEM_DEF(atoms)
 	name = "Atoms"
 	init_order = 11
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm
index bd0c649f64b..636df46df5e 100644
--- a/code/controllers/subsystem/augury.dm
+++ b/code/controllers/subsystem/augury.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(augury)
+SUBSYSTEM_DEF(augury)
 	name = "Augury"
 	flags = SS_NO_INIT
 
diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
index 0b550ad661e..a7c60d3357e 100644
--- a/code/controllers/subsystem/communications.dm
+++ b/code/controllers/subsystem/communications.dm
@@ -1,7 +1,7 @@
 #define COMMUNICATION_COOLDOWN 600
 #define COMMUNICATION_COOLDOWN_AI 600
 
-SUBSYSTEM(communications)
+SUBSYSTEM_DEF(communications)
 	name = "Communications"
 	flags = SS_NO_INIT | SS_NO_FIRE
 
diff --git a/code/controllers/subsystem/disease.dm b/code/controllers/subsystem/disease.dm
index 8014ea25261..fa629df7abd 100644
--- a/code/controllers/subsystem/disease.dm
+++ b/code/controllers/subsystem/disease.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(disease)
+SUBSYSTEM_DEF(disease)
 	name = "Disease"
 	flags = SS_KEEP_TIMING|SS_NO_INIT
 
diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index 9401191ea03..23a8464c0ef 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(events)
+SUBSYSTEM_DEF(events)
 	name = "Events"
 	init_order = 6
 
diff --git a/code/controllers/subsystem/fire_burning.dm b/code/controllers/subsystem/fire_burning.dm
index c2983ffe9ce..af3cb3f6a1c 100644
--- a/code/controllers/subsystem/fire_burning.dm
+++ b/code/controllers/subsystem/fire_burning.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(fire_burning)
+SUBSYSTEM_DEF(fire_burning)
 	name = "Fire Burning"
 	priority = 40
 	flags = SS_NO_INIT|SS_BACKGROUND
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 5bf751d2032..b11dca74f93 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(garbage)
+SUBSYSTEM_DEF(garbage)
 	name = "Garbage"
 	priority = 15
 	wait = 5
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index cd751635c0f..83c58950185 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(icon_smooth)
+SUBSYSTEM_DEF(icon_smooth)
 	name = "Icon Smoothing"
 	init_order = -5
 	wait = 1
diff --git a/code/controllers/subsystem/inbounds.dm b/code/controllers/subsystem/inbounds.dm
index 5c7926c6290..1ac9115982b 100644
--- a/code/controllers/subsystem/inbounds.dm
+++ b/code/controllers/subsystem/inbounds.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(inbounds)
+SUBSYSTEM_DEF(inbounds)
 	name = "Inbounds"
 	priority = 40
 	flags = SS_NO_INIT
diff --git a/code/controllers/subsystem/ipintel.dm b/code/controllers/subsystem/ipintel.dm
index ef60269a90d..0f351c84631 100644
--- a/code/controllers/subsystem/ipintel.dm
+++ b/code/controllers/subsystem/ipintel.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(ipintel)
+SUBSYSTEM_DEF(ipintel)
 	name = "XKeyScore"
 	init_order = -10
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index d554eaece4b..4339d985ebf 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(job)
+SUBSYSTEM_DEF(job)
 	name = "Jobs"
 	init_order = 14
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm
index fd29df6870f..01e01e00933 100644
--- a/code/controllers/subsystem/lighting.dm
+++ b/code/controllers/subsystem/lighting.dm
@@ -2,7 +2,7 @@ var/list/lighting_update_lights    = list() // List of lighting sources  queued
 var/list/lighting_update_corners   = list() // List of lighting corners  queued for update.
 var/list/lighting_update_objects  = list() // List of lighting objects queued for update.
 
-SUBSYSTEM(lighting)
+SUBSYSTEM_DEF(lighting)
 	name = "Lighting"
 	wait = 2
 	init_order = -20
diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
index 7c3aaacb0c3..e2250572190 100644
--- a/code/controllers/subsystem/machines.dm
+++ b/code/controllers/subsystem/machines.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(machines)
+SUBSYSTEM_DEF(machines)
 	name = "Machines"
 	init_order = 9
 	flags = SS_KEEP_TIMING
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 88d1b06ef5e..ecc0943aaae 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(mapping)
+SUBSYSTEM_DEF(mapping)
 	name = "Mapping"
 	init_order = 12
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index 93d476273c5..6c3ce67dc23 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(minimap)
+SUBSYSTEM_DEF(minimap)
 	name = "Minimap"
 	init_order = -2
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index 999ce4707dc..749230307fc 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(mobs)
+SUBSYSTEM_DEF(mobs)
 	name = "Mobs"
 	init_order = 4
 	priority = 100
diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm
index 1664a5cab59..204e03146df 100644
--- a/code/controllers/subsystem/npcpool.dm
+++ b/code/controllers/subsystem/npcpool.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(npcpool)
+SUBSYSTEM_DEF(npcpool)
 	name = "NPC Pool"
 	init_order = 17
 	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_NO_TICK_CHECK
diff --git a/code/controllers/subsystem/orbit.dm b/code/controllers/subsystem/orbit.dm
index 12026eedee3..b7d9392754f 100644
--- a/code/controllers/subsystem/orbit.dm
+++ b/code/controllers/subsystem/orbit.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(orbit)
+SUBSYSTEM_DEF(orbit)
 	name = "Orbits"
 	priority = 35
 	wait = 2
diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm
index e49097c84e4..06efe772ec3 100644
--- a/code/controllers/subsystem/pai.dm
+++ b/code/controllers/subsystem/pai.dm
@@ -1,5 +1,5 @@
 var/list/obj/item/device/paicard/pai_card_list = list()
-SUBSYSTEM(pai)
+SUBSYSTEM_DEF(pai)
 	name = "pAI"
 
 	flags = SS_NO_INIT|SS_NO_FIRE
diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm
index b4cc2a1d62b..d7db234b883 100644
--- a/code/controllers/subsystem/parallax.dm
+++ b/code/controllers/subsystem/parallax.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(parallax)
+SUBSYSTEM_DEF(parallax)
 	name = "Parallax"
 	wait = 2
 	flags = SS_POST_FIRE_TIMING | SS_FIRE_IN_LOBBY | SS_BACKGROUND | SS_NO_INIT
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index 7967086c6d0..ec2bd2812bb 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(persistence)
+SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
 	init_order = -100
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm
index 82888df4c58..40bdf94ffbf 100644
--- a/code/controllers/subsystem/ping.dm
+++ b/code/controllers/subsystem/ping.dm
@@ -1,6 +1,6 @@
 #define PING_BUFFER_TIME 25
 
-SUBSYSTEM(ping)
+SUBSYSTEM_DEF(ping)
 	name = "Ping"
 	wait = 6
 	flags = SS_NO_INIT|SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
diff --git a/code/controllers/subsystem/processing/fastprocess.dm b/code/controllers/subsystem/processing/fastprocess.dm
index 535cc3ea821..9622e021469 100644
--- a/code/controllers/subsystem/processing/fastprocess.dm
+++ b/code/controllers/subsystem/processing/fastprocess.dm
@@ -1,6 +1,6 @@
 //Fires five times every second.
 
-PROCESSING_SUBSYSTEM(fastprocess)
+PROCESSING_SUBSYSTEM_DEF(fastprocess)
 	name = "Fast Processing"
 	wait = 2
 	stat_tag = "FP"
diff --git a/code/controllers/subsystem/processing/flightpacks.dm b/code/controllers/subsystem/processing/flightpacks.dm
index f81c954a250..5619aa8e1ac 100644
--- a/code/controllers/subsystem/processing/flightpacks.dm
+++ b/code/controllers/subsystem/processing/flightpacks.dm
@@ -1,5 +1,5 @@
 
-PROCESSING_SUBSYSTEM(flightpacks)
+PROCESSING_SUBSYSTEM_DEF(flightpacks)
 	name = "Flightpack Movement"
 	priority = 30
 	wait = 2
diff --git a/code/controllers/subsystem/processing/obj.dm b/code/controllers/subsystem/processing/obj.dm
index 5b8d251fa9b..29fe2772328 100644
--- a/code/controllers/subsystem/processing/obj.dm
+++ b/code/controllers/subsystem/processing/obj.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(obj)
+SUBSYSTEM_DEF(obj)
 	name = "Objects"
 	priority = 40
 	flags = SS_NO_INIT
diff --git a/code/controllers/subsystem/processing/overlays.dm b/code/controllers/subsystem/processing/overlays.dm
index 36ed5122cd3..8649ed98165 100644
--- a/code/controllers/subsystem/processing/overlays.dm
+++ b/code/controllers/subsystem/processing/overlays.dm
@@ -1,4 +1,4 @@
-PROCESSING_SUBSYSTEM(overlays)
+PROCESSING_SUBSYSTEM_DEF(overlays)
 	name = "Overlay"
 	flags = SS_TICKER|SS_FIRE_IN_LOBBY
 	wait = 1
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 444625c6eaf..602455621bd 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -1,6 +1,6 @@
 //Used to process objects. Fires once every second.
 
-SUBSYSTEM(processing)
+SUBSYSTEM_DEF(processing)
 	name = "Processing"
 	priority = 25
 	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm
index d5ca65b8119..d69575f60f1 100644
--- a/code/controllers/subsystem/radio.dm
+++ b/code/controllers/subsystem/radio.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(radio)
+SUBSYSTEM_DEF(radio)
 	name = "Radio"
 	init_order = 18
 	flags = SS_NO_FIRE|SS_NO_INIT
diff --git a/code/controllers/subsystem/religion.dm b/code/controllers/subsystem/religion.dm
index 68c2100cd69..b34ab084dd5 100644
--- a/code/controllers/subsystem/religion.dm
+++ b/code/controllers/subsystem/religion.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(religion)
+SUBSYSTEM_DEF(religion)
 	name = "Religion"
 	init_order = 19
 	flags = SS_NO_FIRE|SS_NO_INIT
diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm
index 9794172d020..31daf11f254 100644
--- a/code/controllers/subsystem/server_maint.dm
+++ b/code/controllers/subsystem/server_maint.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(server_maint)
+SUBSYSTEM_DEF(server_maint)
 	name = "Server Tasks"
 	wait = 6000
 	flags = SS_NO_TICK_CHECK
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index d846dc64c6d..ff916baa1ef 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -1,6 +1,6 @@
 #define HIGHLIGHT_DYNAMIC_TRANSIT 1
 
-SUBSYSTEM(shuttle)
+SUBSYSTEM_DEF(shuttle)
 	name = "Shuttle"
 	wait = 10
 	init_order = 3
diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm
index 95edd6358a6..c6d12d2efbc 100644
--- a/code/controllers/subsystem/spacedrift.dm
+++ b/code/controllers/subsystem/spacedrift.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(spacedrift)
+SUBSYSTEM_DEF(spacedrift)
 	name = "Space Drift"
 	priority = 30
 	wait = 5
diff --git a/code/controllers/subsystem/squeak.dm b/code/controllers/subsystem/squeak.dm
index ba7a493d4aa..d7ee9c31c2a 100644
--- a/code/controllers/subsystem/squeak.dm
+++ b/code/controllers/subsystem/squeak.dm
@@ -2,7 +2,7 @@
 // because this is about placement of mice mobs, and nothing to do with
 // mice - the computer peripheral
 
-SUBSYSTEM(squeak)
+SUBSYSTEM_DEF(squeak)
 	name = "Squeak"
 	priority = 40
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/stickyban.dm b/code/controllers/subsystem/stickyban.dm
index 3588cbac274..b5702455b87 100644
--- a/code/controllers/subsystem/stickyban.dm
+++ b/code/controllers/subsystem/stickyban.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(stickyban)
+SUBSYSTEM_DEF(stickyban)
 	name = "Sticky Ban"
 	init_order = -10
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm
index e27a292eda2..7f443aadc05 100644
--- a/code/controllers/subsystem/sun.dm
+++ b/code/controllers/subsystem/sun.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(sun)
+SUBSYSTEM_DEF(sun)
 	name = "Sun"
 	wait = 600
 	init_order = 2
diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm
index bbbc335bec4..edec49bcbbb 100644
--- a/code/controllers/subsystem/tgui.dm
+++ b/code/controllers/subsystem/tgui.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(tgui)
+SUBSYSTEM_DEF(tgui)
 	name = "tgui"
 	wait = 9
 	init_order = 16
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index 303c6c01d2a..bce7c76d0dd 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -1,7 +1,7 @@
 #define MAX_THROWING_DIST 512 // 2 z-levels on default width
 #define MAX_TICKS_TO_MAKE_UP 3 //how many missed ticks will we attempt to make up for this run.
 
-SUBSYSTEM(throwing)
+SUBSYSTEM_DEF(throwing)
 	name = "Throwing"
 	priority = 25
 	wait = 1
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 04597aacb22..205ddbb8c68 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -2,7 +2,7 @@
 
 var/round_start_time = 0
 
-SUBSYSTEM(ticker)
+SUBSYSTEM_DEF(ticker)
 	name = "Ticker"
 	init_order = 13
 
diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm
index 8cc47728042..b822d351fcb 100644
--- a/code/controllers/subsystem/time_track.dm
+++ b/code/controllers/subsystem/time_track.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(time_track)
+SUBSYSTEM_DEF(time_track)
 	name = "Time Tracking"
 	wait = 600
 	flags = SS_NO_INIT|SS_FIRE_IN_LOBBY
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 99a87716af2..0fd4e38abd0 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -1,7 +1,7 @@
 #define BUCKET_LEN (world.fps*1*60) //how many ticks should we keep in the bucket. (1 minutes worth)
 #define BUCKET_POS(timer) (round((timer.timeToRun - SStimer.head_offset) / world.tick_lag) + 1)
 
-SUBSYSTEM(timer)
+SUBSYSTEM_DEF(timer)
 	name = "Timer"
 	wait = 1 //SS_TICKER subsystem, so wait is in ticks
 	init_order = 1
diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm
index 6fb36c662ac..4aad5a0ef3c 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(title)
+SUBSYSTEM_DEF(title)
 	name = "Title Screen"
 	init_order = 15
 	flags = SS_NO_FIRE
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 2d4201a0bfc..3b059522843 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -1,4 +1,4 @@
-SUBSYSTEM(vote)
+SUBSYSTEM_DEF(vote)
 	name = "Vote"
 	wait = 10
 
diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm
index 51aa0370771..4930e9be0c6 100644
--- a/code/controllers/subsystem/weather.dm
+++ b/code/controllers/subsystem/weather.dm
@@ -1,6 +1,6 @@
 //Used for all kinds of weather, ex. lavaland ash storms.
 
-SUBSYSTEM(weather)
+SUBSYSTEM_DEF(weather)
 	name = "Weather"
 	flags = SS_BACKGROUND
 	wait = 10