Revert "Bandaid for the TGS4 Linux trusted mode bug" (#42964)

This reverts commit 360882e7ee (#41668).
This commit is contained in:
Jordan Brown
2019-03-03 23:27:36 -08:00
committed by Tad Hardesty
parent 81ecff0ac5
commit bf29adbadf
3 changed files with 2 additions and 10 deletions
+2 -5
View File
@@ -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()
-4
View File
@@ -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
-1
View File
@@ -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"