Merge pull request #8531 from Spookerton/spkrtn/sys/global-agenda

updates all bare globals to use /global/ semantics, and all shared members to /static/
This commit is contained in:
Atermonera
2022-04-24 19:56:07 -08:00
committed by GitHub
240 changed files with 787 additions and 775 deletions
+6 -7
View File
@@ -420,14 +420,13 @@
/*
* Egg
*/
/var/const //for the status var
BURST = 0
BURSTING = 1
GROWING = 2
GROWN = 3
MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger
MAX_GROWTH_TIME = 3000
var/global/const/BURST = 0
var/global/const/BURSTING = 1
var/global/const/GROWING = 2
var/global/const/GROWN = 3
var/global/const/MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger
var/global/const/MAX_GROWTH_TIME = 3000
/obj/effect/alien/egg
desc = "It looks like a weird egg"
+1 -1
View File
@@ -1,4 +1,4 @@
var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
var/global/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
/obj/effect/bump_teleporter
name = "bump-teleporter"
+2 -2
View File
@@ -8,9 +8,9 @@
var/list/explosion_turfs = list()
var/global/list/explosion_turfs = list()
var/explosion_in_progress = 0
var/global/explosion_in_progress = 0
/proc/explosion_rec(turf/epicenter, power)
+1 -1
View File
@@ -352,7 +352,7 @@
return
//Defines which slots correspond to which slot flags
var/list/global/slot_flags_enumeration = list(
var/global/list/slot_flags_enumeration = list(
"[slot_wear_mask]" = SLOT_MASK,
"[slot_back]" = SLOT_BACK,
"[slot_wear_suit]" = SLOT_OCLOTHING,
+1 -1
View File
@@ -1,4 +1,4 @@
var/list/GPS_list = list()
var/global/list/GPS_list = list()
/obj/item/gps
name = "global positioning system"
+1 -1
View File
@@ -20,7 +20,7 @@
var/client/user_client //since making sure overlays are properly added and removed is pretty important, so we track the current user explicitly
var/flicker = 0
var/global/list/overlay_cache = list() //cache recent overlays
var/static/list/overlay_cache = list() //cache recent overlays
/obj/item/t_scanner/update_icon()
icon_state = "t-ray[on]"
@@ -1,5 +1,5 @@
var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_random_selection/default()
var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random_selection/all()
var/global/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_random_selection/default()
var/global/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random_selection/all()
/datum/uplink_random_item
var/uplink_item // The uplink item
@@ -1,5 +1,5 @@
/*****************Marker Beacons**************************/
var/list/marker_beacon_colors = list(
var/global/list/marker_beacon_colors = list(
"Random" = FALSE, //not a true color, will pick a random color
"Burgundy" = LIGHT_COLOR_FLARE,
"Bronze" = LIGHT_COLOR_ORANGE,
+1 -1
View File
@@ -112,7 +112,7 @@
user.drop_l_hand()
user.stop_pulling()
var/last_chew = 0
var/global/last_chew = 0
/mob/living/carbon/human/RestrainedClickOn(var/atom/A)
if (A != src) return ..()
if (last_chew + 26 > world.time) return
@@ -26,8 +26,8 @@
return INITIALIZE_HINT_QDEL
var/list/image/hazard_overlays
var/list/tape_roll_applications = list()
var/global/list/image/hazard_overlays
var/global/list/tape_roll_applications = list()
/obj/item/tape
name = "tape"
@@ -2,7 +2,7 @@
* Donut Box
*/
var/list/random_weighted_donuts = list(
var/global/list/random_weighted_donuts = list(
/obj/item/reagent_containers/food/snacks/donut/plain = 5,
/obj/item/reagent_containers/food/snacks/donut/plain/jelly = 5,
/obj/item/reagent_containers/food/snacks/donut/pink = 4,
@@ -101,4 +101,4 @@ var/list/random_weighted_donuts = list(
/obj/item/storage/box/wormcan/deluxe/update_icon(var/itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty_deluxe"
icon_state = "wormcan_empty_deluxe"
@@ -1,6 +1,6 @@
#define TANK_IDEAL_PRESSURE 1015 //Arbitrary.
var/list/global/tank_gauge_cache = list()
var/global/list/tank_gauge_cache = list()
/obj/item/tank
name = "tank"
+3 -3
View File
@@ -44,8 +44,8 @@
if(build_path)
return new build_path(drop_location())
var/list/random_junk_
var/list/random_useful_
var/global/list/random_junk_
var/global/list/random_useful_
/proc/get_random_useful_type()
if(!random_useful_)
random_useful_ = subtypesof(/obj/item/pen/crayon)
@@ -103,7 +103,7 @@ var/list/random_useful_
// Multi Point Spawn
// Selects one spawn point out of a group of points with the same ID and asks it to generate its items
*/
var/list/multi_point_spawns
var/global/list/multi_point_spawns
/obj/random_multi
name = "random object spawn point"
+1 -1
View File
@@ -9,7 +9,7 @@
active_power_usage = 5
var/interference = FALSE
var/icon/plant = null
var/global/list/possible_plants = list(
var/static/list/possible_plants = list(
"plant-1",
"plant-10",
"plant-09",
@@ -17,7 +17,7 @@
// the specific order matters to get a usable icon_state, it is
// copied here so that, in the unlikely case that alldirs is changed,
// this continues to work.
var/global/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
var/static/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
// A place where tube pods stop, and people can get in or out.
@@ -520,7 +520,7 @@
// but it is probably safer to assume the existence of, and
// rely on, a sufficiently smart compiler/optimizer.
/obj/structure/transit_tube/proc/parse_dirs(text)
var/global/list/direction_table = list()
var/static/list/direction_table = list()
if(text in direction_table)
return direction_table[text]