[MIRROR] More globals (#12341)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-01-30 12:27:42 -07:00
committed by GitHub
parent 38e634dce7
commit d031fa3c4e
76 changed files with 267 additions and 257 deletions
+3 -3
View File
@@ -77,13 +77,13 @@ ADMIN_VERB(debug_controller, R_DEBUG, "Debug Controller", "Debug the various per
options[strtype] = S
//Goon PS stuff, and other yet-to-be-subsystem things.
options["LEGACY: master_controller"] = master_controller
options["LEGACY: job_master"] = job_master
options["LEGACY: master_controller"] = GLOB.master_controller
options["LEGACY: job_master"] = GLOB.job_master
options["LEGACY: SSradio"] = SSradio
options["LEGACY: emergency_shuttle"] = emergency_shuttle
options["LEGACY: paiController"] = paiController
options["LEGACY: cameranet"] = cameranet
options["LEGACY: transfer_controller"] = transfer_controller
options["LEGACY: transfer_controller"] = GLOB.transfer_controller
var/pick = tgui_input_list(user, "Choose a controller to debug/view variables of.", "VV controller:", options)
if(!pick)
+1 -1
View File
@@ -1,4 +1,4 @@
var/datum/controller/transfer_controller/transfer_controller
GLOBAL_DATUM(transfer_controller, /datum/controller/transfer_controller)
/datum/controller/transfer_controller
var/timerbuffer = 0 //buffer for time check
+10 -13
View File
@@ -5,26 +5,23 @@
//
// TODO - This will be completely replaced by master.dm in time.
//
var/global/datum/controller/game_controller/master_controller //Set in world.New()
var/global/last_tick_duration = 0
GLOBAL_DATUM(master_controller, /datum/controller/game_controller) //Set in world.New()
/datum/controller/game_controller
var/list/shuttle_list // For debugging and VV
/datum/controller/game_controller/New()
//There can be only one master_controller. Out with the old and in with the new.
if(master_controller != src)
if(GLOB.master_controller != src)
log_world("Rebuilding Master Controller")
if(istype(master_controller))
qdel(master_controller)
master_controller = src
if(istype(GLOB.master_controller))
qdel(GLOB.master_controller)
GLOB.master_controller = src
if(!job_master)
job_master = new /datum/controller/occupations()
job_master.SetupOccupations()
job_master.LoadJobs("config/jobs.txt")
if(!GLOB.job_master)
GLOB.job_master = new /datum/controller/occupations()
GLOB.job_master.SetupOccupations()
GLOB.job_master.LoadJobs("config/jobs.txt")
admin_notice(span_danger("Job setup complete"), R_DEBUG)
if(!GLOB.syndicate_code_phrase)
@@ -39,7 +36,7 @@ var/global/last_tick_duration = 0
// setupgenetics() Moved to SSatoms
// SetupXenoarch() - Moved to SSxenoarch
transfer_controller = new
GLOB.transfer_controller = new
admin_notice(span_danger("Initializations complete."), R_DEBUG)
// #if UNIT_TESTS
+2 -2
View File
@@ -109,10 +109,10 @@ SUBSYSTEM_DEF(persist)
if(R) // We found someone with a record.
var/recorded_rank = R.fields["real_rank"]
if(recorded_rank)
. = job_master.GetJob(recorded_rank)
. = GLOB.job_master.GetJob(recorded_rank)
if(.) return
// They have a custom title, aren't crew, or someone deleted their record, so we need a fallback method.
// Let's check the mind.
if(M.mind && M.mind.assigned_role)
. = job_master.GetJob(M.mind.assigned_role)
. = GLOB.job_master.GetJob(M.mind.assigned_role)
+5 -5
View File
@@ -321,16 +321,16 @@ SUBSYSTEM_DEF(ticker)
to_chat(world, span_boldannounce("Serious error in mode setup! Reverting to pregame lobby.")) //Uses setup instead of set up due to computational context.
return 0
job_master.ResetOccupations()
GLOB.job_master.ResetOccupations()
src.mode.create_antagonists()
src.mode.pre_setup()
job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly.
GLOB.job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly.
if(!src.mode.can_start())
to_chat(world, span_filter_system(span_bold("Unable to start [mode.name].") + " Not enough players readied, [CONFIG_GET(keyed_list/player_requirements)[mode.config_tag]] players needed. Reverting to pregame lobby."))
mode.fail_setup()
mode = null
job_master.ResetOccupations()
GLOB.job_master.ResetOccupations()
return 0
if(hide_mode)
@@ -376,7 +376,7 @@ SUBSYSTEM_DEF(ticker)
// Ask their new_player mob to spawn them
if(!player.spawn_checks_vr(player.mind.assigned_role))
var/datum/job/job_datum = job_master.GetJob(J.title)
var/datum/job/job_datum = GLOB.job_master.GetJob(J.title)
job_datum.current_positions--
player.mind.assigned_role = null
continue //VOREStation Add
@@ -413,7 +413,7 @@ SUBSYSTEM_DEF(ticker)
if(player.mind.assigned_role == JOB_SITE_MANAGER)
captainless=0
if(!player_is_antag(player.mind, only_offstation_roles = 1))
job_master.EquipRank(player, player.mind.assigned_role, 0)
GLOB.job_master.EquipRank(player, player.mind.assigned_role, 0)
UpdateFactionList(player)
//equip_custom_items(player) //VOREStation Removal
//player.apply_traits() //VOREStation Removal