cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert some more globals (#19231)

Browse Source 
* move ref lists from world new to ref list creation

* tg styl

* .

* next globals

* ugh

* some more

* pain

* .

* horror

* .

* .

* .

* shoe me

* ye

* .

* eh

* .

* .

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Kashargul
2026-03-02 23:57:41 +01:00
committed by GitHub
co-authored by Cameron Lennox
parent ecca95d008
commit 1fcbb216e7
100 changed files with 547 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/admin.dm
+1 -1
View File
@@ -81,7 +81,7 @@ ADMIN_VERB(debug_controller, R_DEBUG, "Debug Controller", "Debug the various per
options["LEGACY: job_master"] = GLOB.job_master
options["LEGACY: emergency_shuttle"] = GLOB.emergency_shuttle
options["LEGACY: paiController"] = paiController
options["LEGACY: cameranet"] = cameranet
options["LEGACY: cameranet"] = GLOB.cameranet
options["LEGACY: transfer_controller"] = GLOB.transfer_controller
var/pick = tgui_input_list(user, "Choose a controller to debug/view variables of.", "VV controller:", options)
code/controllers/globals.dm
-3
View File
@@ -66,6 +66,3 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
var/end_tick = world.time
if(end_tick - start_tick)
WARNING("Global [replacetext("[I]", "InitGlobal", "")] slept during initialization!")
// Someone make it so this call isn't necessary
populate_legacy_globals()
code/controllers/subsystems/air_traffic.dm
+4 -4
View File
@@ -56,10 +56,10 @@ SUBSYSTEM_DEF(atc)
/datum/controller/subsystem/atc/proc/random_convo()
// Pick from the organizations in the LOREMASTER, so we can find out what these ships are doing
var/one = pick(loremaster.organizations) //These will pick an index, not an instance
var/two = pick(loremaster.organizations)
var/datum/lore/organization/source = loremaster.organizations[one] //Resolve to the instances
var/datum/lore/organization/secondary = loremaster.organizations[two] //repurposed for new fun stuff
var/one = pick(GLOB.loremaster.organizations) //These will pick an index, not an instance
var/two = pick(GLOB.loremaster.organizations)
var/datum/lore/organization/source = GLOB.loremaster.organizations[one] //Resolve to the instances
var/datum/lore/organization/secondary = GLOB.loremaster.organizations[two] //repurposed for new fun stuff
//Random chance things for variety
var/path = chatter_datum.chatter_box(source.org_type,secondary.org_type)
code/controllers/subsystems/appreciation_messages.dm
+6 -6
View File
@@ -67,21 +67,21 @@ SUBSYSTEM_DEF(appreciation)
/datum/controller/subsystem/appreciation/proc/build_appreciation()
if(length(human_list) < required_humans)
appreciated = pick(loremaster.appreciation_targets)
appreciated = pick(GLOB.loremaster.appreciation_targets)
return
if(prob(50))
appreciated = pick(loremaster.appreciation_targets)
appreciated = pick(GLOB.loremaster.appreciation_targets)
return
var/mob/living/carbon/human/H = pick(human_list)
if(!istype(H))
appreciated = pick(loremaster.appreciation_targets)
appreciated = pick(GLOB.loremaster.appreciation_targets)
return
if(H.absorbed)
appreciated = pick(loremaster.appreciation_targets)
appreciated = pick(GLOB.loremaster.appreciation_targets)
return
if(H.custom_species)
@@ -92,8 +92,8 @@ SUBSYSTEM_DEF(appreciation)
/datum/controller/subsystem/appreciation/proc/do_appreciate()
var/appreciation_message = pick(loremaster.appreciation_messages)
var/terrible_factoid = pick(loremaster.terrible_factoids)
var/appreciation_message = pick(GLOB.loremaster.appreciation_messages)
var/terrible_factoid = pick(GLOB.loremaster.terrible_factoids)
msg("Today is [appreciated] appreciation day! [terrible_factoid] [appreciation_message]")
/datum/controller/subsystem/appreciation/proc/msg(var/message,var/sender)
code/controllers/subsystems/statpanel.dm
+1 -1
View File
@@ -240,7 +240,7 @@ SUBSYSTEM_DEF(statpanels)
#endif
for(var/datum/controller/subsystem/sub_system as anything in Master.subsystems)
mc_data[++mc_data.len] = list("\[[sub_system.state_letter()]][sub_system.name]", sub_system.stat_entry(), "\ref[sub_system]")
mc_data[++mc_data.len] = list("Camera Net", "Cameras: [length(global.cameranet.cameras)] | Chunks: [length(global.cameranet.chunks)]", "\ref[global.cameranet]")
mc_data[++mc_data.len] = list("Camera Net", "Cameras: [length(GLOB.cameranet.cameras)] | Chunks: [length(GLOB.cameranet.chunks)]", "\ref[GLOB.cameranet]")
///immediately update the active statpanel tab of the target client
/datum/controller/subsystem/statpanels/proc/immediate_send_stat_data(client/target)