From 85d58968929fdbf9c9053b7bbcbfc8263f3424cb Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Fri, 24 Mar 2017 18:21:17 -0400
Subject: [PATCH] Fuck everything

---
 code/__DEFINES/MC.dm          | 4 ++--
 code/controllers/subsystem.dm | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm
index cdb81476104..00a566dbd93 100644
--- a/code/__DEFINES/MC.dm
+++ b/code/__DEFINES/MC.dm
@@ -71,13 +71,13 @@
 #define SUBSYSTEM_DEF(X) var/datum/controller/subsystem/##X/SS##X;\
 /datum/controller/subsystem/##X/New(){\
     NEW_SS_GLOBAL(SS##X);\
-    ..();\
+    PreInit();\
 }\
 /datum/controller/subsystem/##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);\
-    ..();\
+    PreInit();\
 }\
 /datum/controller/subsystem/processing/##X
\ No newline at end of file
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index c165baafb35..18350bbd41f 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -30,8 +30,7 @@
 
 //Do not override
 /datum/controller/subsystem/New()
-	..()
-	PreInit()
+	return
 
 // Used to initialize the subsystem BEFORE the map has loaded
 // Called AFTER Recover if that is called