From bf29adbadf7e59af2e7ebb79ea3a3574c421523a Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 4 Mar 2019 02:27:36 -0500
Subject: [PATCH] Revert "Bandaid for the TGS4 Linux trusted mode bug" (#42964)

This reverts commit 360882e7eeebc0b1c1e19c890c6a0a6a5b935c9d (#41668).
---
 code/game/world.dm                | 7 ++-----
 code/modules/tgs/event_handler.dm | 4 ----
 tgstation.dme                     | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 code/modules/tgs/event_handler.dm

diff --git a/code/game/world.dm b/code/game/world.dm
index a6deaaeb493..920a7f87738 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,8 +1,6 @@
 #define RESTART_COUNTER_PATH "data/round_counter.txt"
 
 GLOBAL_VAR(restart_counter)
-//TODO: Replace INFINITY with the version that fixes http://www.byond.com/forum/?post=2407430
-GLOBAL_VAR_INIT(bypass_tgs_reboot, world.system_type == UNIX && world.byond_build < INFINITY)
 
 //This happens after the Master subsystem new(s) (it's a global datum)
 //So subsystems globals exist, but are not initialised
@@ -16,7 +14,7 @@ GLOBAL_VAR_INIT(bypass_tgs_reboot, world.system_type == UNIX && world.byond_buil
 
 	make_datum_references_lists()	//initialises global lists for referencing frequently used datums (so that we only ever do it once)
 
-	TgsNew(new /datum/tgs_event_handler/tg, minimum_required_security_level = TGS_SECURITY_TRUSTED)
+	TgsNew(minimum_required_security_level = TGS_SECURITY_TRUSTED)
 
 	GLOB.revdata = new
 
@@ -204,8 +202,7 @@ GLOBAL_VAR_INIT(bypass_tgs_reboot, world.system_type == UNIX && world.byond_buil
 		to_chat(world, "<span class='boldannounce'>Rebooting world...</span>")
 		Master.Shutdown()	//run SS shutdowns
 	
-	if(!GLOB.bypass_tgs_reboot)
-		TgsReboot()
+	TgsReboot()
 
 	if(TEST_RUN_PARAMETER in params)
 		FinishTestRun()
diff --git a/code/modules/tgs/event_handler.dm b/code/modules/tgs/event_handler.dm
deleted file mode 100644
index 3581302671c..00000000000
--- a/code/modules/tgs/event_handler.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/datum/tgs_event_handler/tg/HandleEvent(event_code, ...)
-    switch(event_code)
-        if(TGS_EVENT_COMPILE_COMPLETE)
-            GLOB.bypass_tgs_reboot = FALSE
diff --git a/tgstation.dme b/tgstation.dme
index ae7df1368dd..7fc1c68b61d 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2708,7 +2708,6 @@
 #include "code\modules\surgery\organs\tails.dm"
 #include "code\modules\surgery\organs\tongue.dm"
 #include "code\modules\surgery\organs\vocal_cords.dm"
-#include "code\modules\tgs\event_handler.dm"
 #include "code\modules\tgs\includes.dm"
 #include "code\modules\tgui\external.dm"
 #include "code\modules\tgui\states.dm"