cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Typo Fixes (#17285)

Browse Source
This commit is contained in:
SleepyGemmy
2023-09-09 10:27:40 +00:00
committed by GitHub
parent 37bc7adb86
commit 0d7d64a333
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master/failsafe.dm
+7 -7
View File
@@ -70,8 +70,8 @@ var/datum/controller/failsafe/Failsafe
#if !defined(GC_FAILURE_HARD_LOOKUP)
var/rtn = Recreate_MC()
#else
log_failsafe("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP")
FAILSAFE_MSG("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP")
log_failsafe("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP.")
FAILSAFE_MSG("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP.")
var/rtn = TRUE
#endif
@@ -79,10 +79,10 @@ var/datum/controller/failsafe/Failsafe
defcon = 4
master_iteration = 0
log_failsafe("MC restarted successfully.")
FAILSAFE_MSG("Master Controller restarted successfully!")
FAILSAFE_MSG("MC restarted successfully!")
else if(rtn < 0)
log_failsafe("Could not restart MC, runtime encountered. Entering defcon 0!")
FAILSAFE_MSG("ERROR: DEFCON [defcon_pretty()]. Unable to restart Master Controller, runtime encountered. Silently retrying.")
FAILSAFE_MSG("ERROR: DEFCON [defcon_pretty()]. Unable to restart MC, runtime encountered. Silently retrying.")
//if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again
//no need to handle that specially when defcon 0 can handle it
if(0) //DEFCON 0! (mc failed to restart)
@@ -92,15 +92,15 @@ var/datum/controller/failsafe/Failsafe
var/rtn = Recreate_MC()
#else
var/rtn = TRUE
log_failsafe("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP")
FAILSAFE_MSG("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP")
log_failsafe("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP.")
FAILSAFE_MSG("MC was not actually recreated, because we're compiled with GC_FAILURE_HARD_LOOKUP.")
#endif
if(rtn > 0)
defcon = 4
master_iteration = 0
log_failsafe("MC restarted successfully.")
FAILSAFE_MSG("Master Controller restarted successfully!")
FAILSAFE_MSG("MC restarted successfully.")
else
defcon = min(defcon + 1,5)
master_iteration = Master.iteration
code/controllers/subsystems/garbage.dm
-4
View File
@@ -271,7 +271,3 @@ var/datum/controller/subsystem/garbage_collector/SSgarbage
/client/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
// /image/Destroy()
// ..()
// return QDEL_HINT_HARDDEL