Makes all global variables handled by the GLOB controller (#13152)

* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
This commit is contained in:
AffectedArc07
2020-03-20 21:56:37 -06:00
committed by GitHub
parent c8dbd0190e
commit 210f8badf4
667 changed files with 4243 additions and 4240 deletions
+4 -4
View File
@@ -765,11 +765,11 @@
/obj/machinery/power/apc/proc/get_malf_status(mob/living/silicon/ai/malf)
if(!istype(malf))
return FALSE
// Only if they're a traitor OR they have the malf picker from the combat module
if(!malf.mind.has_antag_datum(/datum/antagonist/traitor) && !malf.malf_picker)
return FALSE
if(malfai == (malf.parent || malf))
if(occupier == malf)
return APC_MALF_SHUNTED_HERE
@@ -793,7 +793,7 @@
// Auto update every Master Controller tick
ui.set_auto_update(1)
/obj/machinery/power/apc/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/power/apc/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["locked"] = is_locked(user)
data["isOperating"] = operating
@@ -1079,7 +1079,7 @@
qdel(occupier)
if(seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
for(var/obj/item/pinpointer/point in GLOB.pinpointer_list)
for(var/mob/living/silicon/ai/A in ai_list)
for(var/mob/living/silicon/ai/A in GLOB.ai_list)
if((A.stat != DEAD) && A.nuking)
point.the_disk = A //The pinpointer tracks the AI back into its core.
else
+7 -7
View File
@@ -3,7 +3,7 @@
// Gravity Generator
//
var/list/gravity_generators = list() // We will keep track of this by adding new gravity generators to the list, and keying it with the z level.
GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding new gravity generators to the list, and keying it with the z level.
#define GRAV_POWER_IDLE 0
#define GRAV_POWER_UP 1
@@ -388,19 +388,19 @@ var/list/gravity_generators = list() // We will keep track of this by adding new
var/turf/T = get_turf(src)
if(!T)
return 0
if(gravity_generators["[T.z]"])
return length(gravity_generators["[T.z]"])
if(GLOB.gravity_generators["[T.z]"])
return length(GLOB.gravity_generators["[T.z]"])
return 0
/obj/machinery/gravity_generator/main/proc/update_list()
var/turf/T = get_turf(src.loc)
if(T)
if(!gravity_generators["[T.z]"])
gravity_generators["[T.z]"] = list()
if(!GLOB.gravity_generators["[T.z]"])
GLOB.gravity_generators["[T.z]"] = list()
if(on)
gravity_generators["[T.z]"] |= src
GLOB.gravity_generators["[T.z]"] |= src
else
gravity_generators["[T.z]"] -= src
GLOB.gravity_generators["[T.z]"] -= src
// Misc
+1 -1
View File
@@ -333,7 +333,7 @@
ui.open()
ui.set_auto_update(1)
/obj/machinery/power/port_gen/pacman/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/power/port_gen/pacman/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["active"] = active
+2 -2
View File
@@ -162,7 +162,7 @@
var/cdir
var/turf/T
for(var/card in cardinal)
for(var/card in GLOB.cardinal)
T = get_step(loc,card)
cdir = get_dir(T,loc)
@@ -182,7 +182,7 @@
var/cdir
var/turf/T
for(var/card in cardinal)
for(var/card in GLOB.cardinal)
T = get_step(loc,card)
cdir = get_dir(T,loc)
+3 -3
View File
@@ -1,4 +1,4 @@
var/global/list/rad_collectors = list()
GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector
name = "Radiation Collector Array"
@@ -19,10 +19,10 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/Initialize(mapload)
. = ..()
rad_collectors += src
GLOB.rad_collectors += src
/obj/machinery/power/rad_collector/Destroy()
rad_collectors -= src
GLOB.rad_collectors -= src
return ..()
/obj/machinery/power/rad_collector/process()
@@ -113,7 +113,7 @@
if(allowed_size >= STAGE_TWO)
// Start moving even before we reach "true" stage two.
// If we are stage one and are sufficiently energetic to be allowed to 2,
// it might mean we are stuck in a corner somewere. So move around to try to expand.
// it might mean we are stuck in a corner somewere. So move around to try to expand.
move()
if(current_size >= STAGE_TWO)
pulse()
@@ -287,7 +287,7 @@
if(!move_self)
return 0
var/movement_dir = pick(alldirs - last_failed_movement)
var/movement_dir = pick(GLOB.alldirs - last_failed_movement)
if(force_move)
movement_dir = force_move
@@ -431,7 +431,7 @@
/obj/singularity/proc/pulse()
for(var/obj/machinery/power/rad_collector/R in rad_collectors)
for(var/obj/machinery/power/rad_collector/R in GLOB.rad_collectors)
if(R.z == z && get_dist(R, src) <= 15) // Better than using orange() every process
R.receive_pulse(energy)
+2 -2
View File
@@ -51,7 +51,7 @@
RefreshParts()
dir_loop:
for(var/d in cardinal)
for(var/d in GLOB.cardinal)
var/turf/T = get_step(src, d)
for(var/obj/machinery/power/terminal/term in T)
if(term && term.dir == turn(d, 180))
@@ -371,7 +371,7 @@
// auto update every Master Controller tick
ui.set_auto_update(1)
/obj/machinery/power/smes/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/power/smes/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["nameTag"] = name_tag
+1 -1
View File
@@ -379,7 +379,7 @@
ui.open()
ui.set_auto_update(1)
/obj/machinery/power/solar_control/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/power/solar_control/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["generated"] = round(lastgen)
@@ -344,7 +344,7 @@
ui.open()
ui.set_auto_update(1)
/obj/machinery/power/supermatter_shard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/power/supermatter_shard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["integrity_percentage"] = round(get_integrity())
@@ -366,7 +366,7 @@
return data
/obj/machinery/power/supermatter_shard/proc/transfer_energy()
for(var/obj/machinery/power/rad_collector/R in rad_collectors)
for(var/obj/machinery/power/rad_collector/R in GLOB.rad_collectors)
if(get_dist(R, src) <= 15) // Better than using orange() every process
R.receive_pulse(power/10)
return
+1 -1
View File
@@ -67,7 +67,7 @@
//we face the last thing we zapped, so this lets us favor that direction a bit
var/first_move = dir
for(var/i in 0 to move_amount)
var/move_dir = pick(alldirs + first_move) //give the first move direction a bit of favoring.
var/move_dir = pick(GLOB.alldirs + first_move) //give the first move direction a bit of favoring.
if(target && prob(60))
move_dir = get_dir(src,target)
var/turf/T = get_step(src, move_dir)