| Nuclear disk(s) |
| [N.name], "
var/atom/disk_loc = N.loc
while(!istype(disk_loc, /turf))
diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm
index a90383e18b..b0649672dd 100644
--- a/code/game/antagonist/station/cultist.dm
+++ b/code/game/antagonist/station/cultist.dm
@@ -94,10 +94,10 @@ var/datum/antagonist/cultist/cult
word = pick(allwords)
// Ensure runes are randomized.
- if(!cultwords["travel"])
+ if(!GLOB.cultwords["travel"])
runerandom()
- var/wordexp = "[cultwords[word]] is [word]..."
+ var/wordexp = "[GLOB.cultwords[word]] is [word]..."
to_chat(cult_mob, span_warning("You remember one thing from the dark teachings of your master... [wordexp]"))
cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0)
diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm
index 1d3a4b45cd..f05e232192 100644
--- a/code/game/antagonist/station/traitor.dm
+++ b/code/game/antagonist/station/traitor.dm
@@ -102,10 +102,10 @@ var/datum/antagonist/traitor/traitors
/datum/antagonist/traitor/proc/give_codewords(mob/living/traitor_mob)
to_chat(traitor_mob, span_underline(span_bold("Your employers provided you with the following information on how to identify possible allies:")))
- to_chat(traitor_mob, span_bold("Code Phrase") + ": " + span_danger("[syndicate_code_phrase]"))
- to_chat(traitor_mob, span_bold("Code Response") + ": " + span_danger("[syndicate_code_response]"))
- traitor_mob.mind.store_memory(span_bold("Code Phrase") + ": [syndicate_code_phrase]")
- traitor_mob.mind.store_memory(span_bold("Code Response") + ": [syndicate_code_response]")
+ to_chat(traitor_mob, span_bold("Code Phrase") + ": " + span_danger("[GLOB.syndicate_code_phrase]"))
+ to_chat(traitor_mob, span_bold("Code Response") + ": " + span_danger("[GLOB.syndicate_code_response]"))
+ traitor_mob.mind.store_memory(span_bold("Code Phrase") + ": [GLOB.syndicate_code_phrase]")
+ traitor_mob.mind.store_memory(span_bold("Code Response") + ": [GLOB.syndicate_code_response]")
to_chat(traitor_mob, "Use the code words, preferably in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.")
/datum/antagonist/traitor/proc/spawn_uplink(var/mob/living/carbon/human/traitor_mob)
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 219c1af7b4..448a52f0da 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -502,35 +502,35 @@ var/list/mob/living/forced_ambiance_list = new
/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
-var/list/teleportlocs = list()
+GLOBAL_LIST_EMPTY(teleportlocs)
/hook/startup/proc/setupTeleportLocs()
for(var/area/AR in world)
if(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station) || istype(AR, /area/wizard_station)) continue
- if(teleportlocs.Find(AR.name)) continue
+ if(GLOB.teleportlocs.Find(AR.name)) continue
var/turf/picked = pick(get_area_turfs(AR.type))
if (picked.z in using_map.station_levels)
- teleportlocs += AR.name
- teleportlocs[AR.name] = AR
+ GLOB.teleportlocs += AR.name
+ GLOB.teleportlocs[AR.name] = AR
- teleportlocs = sortAssoc(teleportlocs)
+ GLOB.teleportlocs = sortAssoc(GLOB.teleportlocs)
return 1
-var/list/ghostteleportlocs = list()
+GLOBAL_LIST_EMPTY(ghostteleportlocs)
/hook/startup/proc/setupGhostTeleportLocs()
for(var/area/AR in world)
- if(ghostteleportlocs.Find(AR.name)) continue
+ if(GLOB.ghostteleportlocs.Find(AR.name)) continue
if(istype(AR, /area/aisat) || istype(AR, /area/derelict) || istype(AR, /area/tdome) || istype(AR, /area/shuttle/specops/centcom))
- ghostteleportlocs += AR.name
- ghostteleportlocs[AR.name] = AR
+ GLOB.ghostteleportlocs += AR.name
+ GLOB.ghostteleportlocs[AR.name] = AR
var/turf/picked = pick(get_area_turfs(AR.type))
if (picked.z in using_map.player_levels)
- ghostteleportlocs += AR.name
- ghostteleportlocs[AR.name] = AR
+ GLOB.ghostteleportlocs += AR.name
+ GLOB.ghostteleportlocs[AR.name] = AR
- ghostteleportlocs = sortAssoc(ghostteleportlocs)
+ GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs)
return 1
diff --git a/code/game/birthday.dm b/code/game/birthday.dm
index c029aaac6f..9b6fb074b8 100644
--- a/code/game/birthday.dm
+++ b/code/game/birthday.dm
@@ -6,19 +6,19 @@
if(real_name != client.prefs.real_name) //let's not celebrate the birthday of that weird mob we got dropped into
return
- if(!(read_preference(/datum/preference/numeric/human/last_bday_note) < GLOB.world_time_year)) //you only get notified once a year // CHOMPEdit - Managed Globals
+ if(!(read_preference(/datum/preference/numeric/human/last_bday_note) < GLOB.world_time_year)) //you only get notified once a year
return
- if((GLOB.world_time_month == bday_month) && (GLOB.world_time_day == bday_day)) //it is your birthday // CHOMPEdit - Managed Globals
+ if((GLOB.world_time_month == bday_month) && (GLOB.world_time_day == bday_day)) //it is your birthday
birthday(1)
- else if(GLOB.world_time_month > bday_month) //your birthday was in a previous month // CHOMPEdit - Managed Globals
+ else if(GLOB.world_time_month > bday_month) //your birthday was in a previous month
birthday()
- else if((GLOB.world_time_month == bday_month) && (GLOB.world_time_day > bday_day)) //your birthday was earlier this month // CHOMPEdit - Managed Globals
+ else if((GLOB.world_time_month == bday_month) && (GLOB.world_time_day > bday_day)) //your birthday was earlier this month
birthday()
/mob/living/carbon/human/proc/birthday(var/birthday = 0)
var/msg
var/lastyear = read_preference(/datum/preference/numeric/human/last_bday_note)
- write_preference_directly(/datum/preference/numeric/human/last_bday_note, GLOB.world_time_year) //We only want to ask once a year per character, this persists, update early in case of shenanigans // CHOMPEdit - Managed Globals
+ write_preference_directly(/datum/preference/numeric/human/last_bday_note, GLOB.world_time_year) //We only want to ask once a year per character, this persists, update early in case of shenanigans
if(birthday) //woo
msg = "Today is your birthday! Do you want to increase your character's listed age?"
/* //Chomp DISABLE - Absolutely not.
@@ -33,7 +33,7 @@
if(lastyear == 0) //We've never been asked, so let's just assume you were keeping track before now and only add 1
age += 1
else
- var/howmuch = GLOB.world_time_year - lastyear // CHOMPEdit - Managed Globals
+ var/howmuch = GLOB.world_time_year - lastyear
age += howmuch
to_chat(src, span_notice("You are now [age]! Happy birthday!"))
write_preference_directly(/datum/preference/numeric/human/age, age) //Set the age on the character sheet
diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index b0d47efcaa..ede664982a 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -176,10 +176,10 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
wing_style = wing_styles_list.Find(character.wing_style.type)
// Playerscale (This assumes list is sorted big->small)
- var/size_multiplier = player_sizes_list.len // If fail to find, take smallest
- for(var/N in player_sizes_list)
- if(character.size_multiplier >= player_sizes_list[N])
- size_multiplier = player_sizes_list.Find(N)
+ var/size_multiplier = GLOB.player_sizes_list.len // If fail to find, take smallest
+ for(var/N in GLOB.player_sizes_list)
+ if(character.size_multiplier >= GLOB.player_sizes_list[N])
+ size_multiplier = GLOB.player_sizes_list.Find(N)
break
// Technically custom_species is not part of the UI, but this place avoids merge problems.
@@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
SetUIValueRange(DNA_UI_EAR_STYLE, ear_style + 1, ear_styles_list.len + 1, 1)
SetUIValueRange(DNA_UI_EAR_SECONDARY_STYLE, ear_secondary_style + 1, ear_styles_list.len + 1, 1)
SetUIValueRange(DNA_UI_TAIL_STYLE, tail_style + 1, tail_styles_list.len + 1, 1)
- SetUIValueRange(DNA_UI_PLAYERSCALE, size_multiplier, player_sizes_list.len, 1)
+ SetUIValueRange(DNA_UI_PLAYERSCALE, size_multiplier, GLOB.player_sizes_list.len, 1)
SetUIValueRange(DNA_UI_WING_STYLE, wing_style + 1, wing_styles_list.len + 1, 1)
SetUIValueRange(DNA_UI_TAIL_R, character.r_tail, 255, 1)
diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm
index 1932f65be8..ff7b425187 100644
--- a/code/game/dna/dna2_helpers.dm
+++ b/code/game/dna/dna2_helpers.dm
@@ -245,9 +245,9 @@
H.a_wing = dna.GetUIValueRange(DNA_UI_WING_ALPHA, 255)
// Playerscale
- var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, player_sizes_list.len)
- if((0 < size) && (size <= player_sizes_list.len))
- H.resize(player_sizes_list[player_sizes_list[size]], TRUE, ignore_prefs = TRUE)
+ var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, GLOB.player_sizes_list.len)
+ if((0 < size) && (size <= GLOB.player_sizes_list.len))
+ H.resize(GLOB.player_sizes_list[GLOB.player_sizes_list[size]], TRUE, ignore_prefs = TRUE)
// Tail/Taur Color
H.r_tail = dna.GetUIValueRange(DNA_UI_TAIL_R, 255)
diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm
index d7d6608a5a..8f20a6d348 100644
--- a/code/game/dna/genes/gene.dm
+++ b/code/game/dna/genes/gene.dm
@@ -103,7 +103,7 @@
// check trait if not. CONFLICT-O-TRON ENGAGE
conflict_traits[P] = FALSE
- var/datum/trait/instance_test = all_traits[P]
+ var/datum/trait/instance_test = GLOB.all_traits[P]
if(path in instance_test.excludes)
conflict_traits[P] = TRUE
has_conflict = TRUE
diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm
index 1beb9081e3..2295d07ebd 100644
--- a/code/game/gamemodes/calamity/calamity.dm
+++ b/code/game/gamemodes/calamity/calamity.dm
@@ -12,10 +12,10 @@
/datum/game_mode/calamity/create_antagonists()
- shuffle(all_antag_types) // This is probably the only instance in the game where the order will be important.
+ shuffle(GLOB.all_antag_types) // This is probably the only instance in the game where the order will be important.
var/i = 1
var/grab_antags = round(num_players()/ANTAG_TYPE_RATIO)+1
- for(var/antag_id in all_antag_types)
+ for(var/antag_id in GLOB.all_antag_types)
if(i > grab_antags)
break
antag_tags |= antag_id
diff --git a/code/game/gamemodes/cult/hell_universe.dm b/code/game/gamemodes/cult/hell_universe.dm
index e5d549cec5..36f9c2f4bb 100644
--- a/code/game/gamemodes/cult/hell_universe.dm
+++ b/code/game/gamemodes/cult/hell_universe.dm
@@ -50,7 +50,7 @@ In short:
OverlayAndAmbientSet()
lightsout(0,0)
- runedec += 9000 //basically removing the rune cap
+ GLOB.runedec += 9000 //basically removing the rune cap
/datum/universal_state/hell/proc/AreaSet()
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 6bf37a4f46..530c27f9d4 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -1,24 +1,24 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-var/cultwords = list()
-var/runedec = 0
-var/global/list/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", "self", "see", "other", "hide")
-var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri")
+GLOBAL_LIST_EMPTY(cultwords)
+GLOBAL_VAR_INIT(runedec, 0)
+GLOBAL_LIST_INIT(engwords, list("travel", "blood", "join", "hell", "destroy", "technology", "self", "see", "other", "hide"))
+GLOBAL_LIST_INIT(rnwords, list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri"))
/client/proc/check_words() // -- Urist
set category = "Admin.Secrets"
set name = "Check Rune Words"
set desc = "Check the rune-word meaning"
- if(!cultwords["travel"])
+ if(!GLOB.cultwords["travel"])
runerandom()
- for (var/word in engwords)
- to_chat(usr, "[cultwords[word]] is [word]")
+ for (var/word in GLOB.engwords)
+ to_chat(usr, "[GLOB.cultwords[word]] is [word]")
/proc/runerandom() //randomizes word meaning
- var/list/runewords=rnwords
- for (var/word in engwords)
- cultwords[word] = pick(runewords)
- runewords-=cultwords[word]
+ var/list/runewords=GLOB.rnwords
+ for (var/word in GLOB.engwords)
+ GLOB.cultwords[word] = pick(runewords)
+ runewords -= GLOB.cultwords[word]
/obj/effect/rune
desc = "A strange collection of symbols drawn in blood."
@@ -112,53 +112,53 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
return fizzle()
// if(!src.visibility)
// src.visibility=1
- if(word1 == cultwords["travel"] && word2 == cultwords["self"])
+ if(word1 == GLOB.cultwords["travel"] && word2 == GLOB.cultwords["self"])
return teleport(src.word3)
- if(word1 == cultwords["see"] && word2 == cultwords["blood"] && word3 == cultwords["hell"])
+ if(word1 == GLOB.cultwords["see"] && word2 == GLOB.cultwords["blood"] && word3 == GLOB.cultwords["hell"])
return tomesummon()
- if(word1 == cultwords["hell"] && word2 == cultwords["destroy"] && word3 == cultwords["other"])
+ if(word1 == GLOB.cultwords["hell"] && word2 == GLOB.cultwords["destroy"] && word3 == GLOB.cultwords["other"])
return armor()
- if(word1 == cultwords["join"] && word2 == cultwords["blood"] && word3 == cultwords["self"])
+ if(word1 == GLOB.cultwords["join"] && word2 == GLOB.cultwords["blood"] && word3 == GLOB.cultwords["self"])
return convert()
- if(word1 == cultwords["hell"] && word2 == cultwords["join"] && word3 == cultwords["self"])
+ if(word1 == GLOB.cultwords["hell"] && word2 == GLOB.cultwords["join"] && word3 == GLOB.cultwords["self"])
return tearreality()
- if(word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["technology"])
+ if(word1 == GLOB.cultwords["destroy"] && word2 == GLOB.cultwords["see"] && word3 == GLOB.cultwords["technology"])
return emp(src.loc,5)
- if(word1 == cultwords["travel"] && word2 == cultwords["blood"] && word3 == cultwords["self"])
+ if(word1 == GLOB.cultwords["travel"] && word2 == GLOB.cultwords["blood"] && word3 == GLOB.cultwords["self"])
return drain()
- if(word1 == cultwords["see"] && word2 == cultwords["hell"] && word3 == cultwords["join"])
+ if(word1 == GLOB.cultwords["see"] && word2 == GLOB.cultwords["hell"] && word3 == GLOB.cultwords["join"])
return seer()
- if(word1 == cultwords["blood"] && word2 == cultwords["join"] && word3 == cultwords["hell"])
+ if(word1 == GLOB.cultwords["blood"] && word2 == GLOB.cultwords["join"] && word3 == GLOB.cultwords["hell"])
return raise()
- if(word1 == cultwords["hide"] && word2 == cultwords["see"] && word3 == cultwords["blood"])
+ if(word1 == GLOB.cultwords["hide"] && word2 == GLOB.cultwords["see"] && word3 == GLOB.cultwords["blood"])
return obscure(4)
- if(word1 == cultwords["hell"] && word2 == cultwords["travel"] && word3 == cultwords["self"])
+ if(word1 == GLOB.cultwords["hell"] && word2 == GLOB.cultwords["travel"] && word3 == GLOB.cultwords["self"])
return ajourney()
- if(word1 == cultwords["blood"] && word2 == cultwords["see"] && word3 == cultwords["travel"])
+ if(word1 == GLOB.cultwords["blood"] && word2 == GLOB.cultwords["see"] && word3 == GLOB.cultwords["travel"])
return manifest()
- if(word1 == cultwords["hell"] && word2 == cultwords["technology"] && word3 == cultwords["join"])
+ if(word1 == GLOB.cultwords["hell"] && word2 == GLOB.cultwords["technology"] && word3 == GLOB.cultwords["join"])
return talisman()
- if(word1 == cultwords["hell"] && word2 == cultwords["blood"] && word3 == cultwords["join"])
+ if(word1 == GLOB.cultwords["hell"] && word2 == GLOB.cultwords["blood"] && word3 == GLOB.cultwords["join"])
return sacrifice()
- if(word1 == cultwords["blood"] && word2 == cultwords["see"] && word3 == cultwords["hide"])
+ if(word1 == GLOB.cultwords["blood"] && word2 == GLOB.cultwords["see"] && word3 == GLOB.cultwords["hide"])
return revealrunes(src)
- if(word1 == cultwords["destroy"] && word2 == cultwords["travel"] && word3 == cultwords["self"])
+ if(word1 == GLOB.cultwords["destroy"] && word2 == GLOB.cultwords["travel"] && word3 == GLOB.cultwords["self"])
return wall()
- if(word1 == cultwords["travel"] && word2 == cultwords["technology"] && word3 == cultwords["other"])
+ if(word1 == GLOB.cultwords["travel"] && word2 == GLOB.cultwords["technology"] && word3 == GLOB.cultwords["other"])
return freedom()
- if(word1 == cultwords["join"] && word2 == cultwords["other"] && word3 == cultwords["self"])
+ if(word1 == GLOB.cultwords["join"] && word2 == GLOB.cultwords["other"] && word3 == GLOB.cultwords["self"])
return cultsummon()
- if(word1 == cultwords["hide"] && word2 == cultwords["other"] && word3 == cultwords["see"])
+ if(word1 == GLOB.cultwords["hide"] && word2 == GLOB.cultwords["other"] && word3 == GLOB.cultwords["see"])
return deafen()
- if(word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["other"])
+ if(word1 == GLOB.cultwords["destroy"] && word2 == GLOB.cultwords["see"] && word3 == GLOB.cultwords["other"])
return blind()
- if(word1 == cultwords["destroy"] && word2 == cultwords["see"] && word3 == cultwords["blood"])
+ if(word1 == GLOB.cultwords["destroy"] && word2 == GLOB.cultwords["see"] && word3 == GLOB.cultwords["blood"])
return bloodboil()
- if(word1 == cultwords["self"] && word2 == cultwords["other"] && word3 == cultwords["technology"])
+ if(word1 == GLOB.cultwords["self"] && word2 == GLOB.cultwords["other"] && word3 == GLOB.cultwords["technology"])
return communicate()
- if(word1 == cultwords["travel"] && word2 == cultwords["other"])
+ if(word1 == GLOB.cultwords["travel"] && word2 == GLOB.cultwords["other"])
return itemport(src.word3)
- if(word1 == cultwords["join"] && word2 == cultwords["hide"] && word3 == cultwords["technology"])
+ if(word1 == GLOB.cultwords["join"] && word2 == GLOB.cultwords["hide"] && word3 == GLOB.cultwords["technology"])
return runestun()
else
return fizzle()
@@ -290,10 +290,10 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
/obj/item/book/tome/Initialize(mapload)
. = ..()
- if(!cultwords["travel"])
+ if(!GLOB.cultwords["travel"])
runerandom()
- for(var/V in cultwords)
- words[cultwords[V]] = V
+ for(var/V in GLOB.cultwords)
+ words[GLOB.cultwords[V]] = V
/obj/item/book/tome/attack(mob/living/M as mob, mob/living/user as mob)
add_attack_logs(user,M,"Hit with [name]")
@@ -318,7 +318,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
if(!user.canmove || user.stat || user.restrained())
return
- if(!cultwords["travel"])
+ if(!GLOB.cultwords["travel"])
runerandom()
if(iscultist(user))
var/C = 0
@@ -328,7 +328,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
to_chat(user, span_warning("You do not have enough space to write a proper rune."))
return
- if (C>=26 + runedec + cult.current_antagonists.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist
+ if (C>=26 + GLOB.runedec + cult.current_antagonists.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist
tgui_alert_async(user, "The cloth of reality can't take that much of a strain. Remove some runes first!")
return
else
@@ -440,7 +440,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
/obj/item/book/tome/imbued/attack_self(mob/user as mob)
if(src.cultistsonly && !iscultist(user))
return
- if(!cultwords["travel"])
+ if(!GLOB.cultwords["travel"])
runerandom()
if(user)
var/r
@@ -461,8 +461,8 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
var/beacon
if(user)
beacon = tgui_input_list(user, "Select the last rune", "Rune Scribing", words, timeout=30 SECONDS)
- R.word1=cultwords["travel"]
- R.word2=cultwords["self"]
+ R.word1=GLOB.cultwords["travel"]
+ R.word2=GLOB.cultwords["self"]
R.word3=beacon
R.loc = user.loc
R.check_icon()
@@ -471,140 +471,140 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
var/beacon
if(user)
beacon = tgui_input_list(user, "Select the last rune", "Rune Scribing", words, timeout=30 SECONDS)
- R.word1=cultwords["travel"]
- R.word2=cultwords["other"]
+ R.word1=GLOB.cultwords["travel"]
+ R.word2=GLOB.cultwords["other"]
R.word3=beacon
R.loc = user.loc
R.check_icon()
if("tome")
- R.word1=cultwords["see"]
- R.word2=cultwords["blood"]
- R.word3=cultwords["hell"]
+ R.word1=GLOB.cultwords["see"]
+ R.word2=GLOB.cultwords["blood"]
+ R.word3=GLOB.cultwords["hell"]
R.loc = user.loc
R.check_icon()
if("armor")
- R.word1=cultwords["hell"]
- R.word2=cultwords["destroy"]
- R.word3=cultwords["other"]
+ R.word1=GLOB.cultwords["hell"]
+ R.word2=GLOB.cultwords["destroy"]
+ R.word3=GLOB.cultwords["other"]
R.loc = user.loc
R.check_icon()
if("convert")
- R.word1=cultwords["join"]
- R.word2=cultwords["blood"]
- R.word3=cultwords["self"]
+ R.word1=GLOB.cultwords["join"]
+ R.word2=GLOB.cultwords["blood"]
+ R.word3=GLOB.cultwords["self"]
R.loc = user.loc
R.check_icon()
if("tear in reality")
- R.word1=cultwords["hell"]
- R.word2=cultwords["join"]
- R.word3=cultwords["self"]
+ R.word1=GLOB.cultwords["hell"]
+ R.word2=GLOB.cultwords["join"]
+ R.word3=GLOB.cultwords["self"]
R.loc = user.loc
R.check_icon()
if("emp")
- R.word1=cultwords["destroy"]
- R.word2=cultwords["see"]
- R.word3=cultwords["technology"]
+ R.word1=GLOB.cultwords["destroy"]
+ R.word2=GLOB.cultwords["see"]
+ R.word3=GLOB.cultwords["technology"]
R.loc = user.loc
R.check_icon()
if("drain")
- R.word1=cultwords["travel"]
- R.word2=cultwords["blood"]
- R.word3=cultwords["self"]
+ R.word1=GLOB.cultwords["travel"]
+ R.word2=GLOB.cultwords["blood"]
+ R.word3=GLOB.cultwords["self"]
R.loc = user.loc
R.check_icon()
if("seer")
- R.word1=cultwords["see"]
- R.word2=cultwords["hell"]
- R.word3=cultwords["join"]
+ R.word1=GLOB.cultwords["see"]
+ R.word2=GLOB.cultwords["hell"]
+ R.word3=GLOB.cultwords["join"]
R.loc = user.loc
R.check_icon()
if("raise")
- R.word1=cultwords["blood"]
- R.word2=cultwords["join"]
- R.word3=cultwords["hell"]
+ R.word1=GLOB.cultwords["blood"]
+ R.word2=GLOB.cultwords["join"]
+ R.word3=GLOB.cultwords["hell"]
R.loc = user.loc
R.check_icon()
if("obscure")
- R.word1=cultwords["hide"]
- R.word2=cultwords["see"]
- R.word3=cultwords["blood"]
+ R.word1=GLOB.cultwords["hide"]
+ R.word2=GLOB.cultwords["see"]
+ R.word3=GLOB.cultwords["blood"]
R.loc = user.loc
R.check_icon()
if("astral journey")
- R.word1=cultwords["hell"]
- R.word2=cultwords["travel"]
- R.word3=cultwords["self"]
+ R.word1=GLOB.cultwords["hell"]
+ R.word2=GLOB.cultwords["travel"]
+ R.word3=GLOB.cultwords["self"]
R.loc = user.loc
R.check_icon()
if("manifest")
- R.word1=cultwords["blood"]
- R.word2=cultwords["see"]
- R.word3=cultwords["travel"]
+ R.word1=GLOB.cultwords["blood"]
+ R.word2=GLOB.cultwords["see"]
+ R.word3=GLOB.cultwords["travel"]
R.loc = user.loc
R.check_icon()
if("imbue talisman")
- R.word1=cultwords["hell"]
- R.word2=cultwords["technology"]
- R.word3=cultwords["join"]
+ R.word1=GLOB.cultwords["hell"]
+ R.word2=GLOB.cultwords["technology"]
+ R.word3=GLOB.cultwords["join"]
R.loc = user.loc
R.check_icon()
if("sacrifice")
- R.word1=cultwords["hell"]
- R.word2=cultwords["blood"]
- R.word3=cultwords["join"]
+ R.word1=GLOB.cultwords["hell"]
+ R.word2=GLOB.cultwords["blood"]
+ R.word3=GLOB.cultwords["join"]
R.loc = user.loc
R.check_icon()
if("reveal")
- R.word1=cultwords["blood"]
- R.word2=cultwords["see"]
- R.word3=cultwords["hide"]
+ R.word1=GLOB.cultwords["blood"]
+ R.word2=GLOB.cultwords["see"]
+ R.word3=GLOB.cultwords["hide"]
R.loc = user.loc
R.check_icon()
if("wall")
- R.word1=cultwords["destroy"]
- R.word2=cultwords["travel"]
- R.word3=cultwords["self"]
+ R.word1=GLOB.cultwords["destroy"]
+ R.word2=GLOB.cultwords["travel"]
+ R.word3=GLOB.cultwords["self"]
R.loc = user.loc
R.check_icon()
if("freedom")
- R.word1=cultwords["travel"]
- R.word2=cultwords["technology"]
- R.word3=cultwords["other"]
+ R.word1=GLOB.cultwords["travel"]
+ R.word2=GLOB.cultwords["technology"]
+ R.word3=GLOB.cultwords["other"]
R.loc = user.loc
R.check_icon()
if("cultsummon")
- R.word1=cultwords["join"]
- R.word2=cultwords["other"]
- R.word3=cultwords["self"]
+ R.word1=GLOB.cultwords["join"]
+ R.word2=GLOB.cultwords["other"]
+ R.word3=GLOB.cultwords["self"]
R.loc = user.loc
R.check_icon()
if("deafen")
- R.word1=cultwords["hide"]
- R.word2=cultwords["other"]
- R.word3=cultwords["see"]
+ R.word1=GLOB.cultwords["hide"]
+ R.word2=GLOB.cultwords["other"]
+ R.word3=GLOB.cultwords["see"]
R.loc = user.loc
R.check_icon()
if("blind")
- R.word1=cultwords["destroy"]
- R.word2=cultwords["see"]
- R.word3=cultwords["other"]
+ R.word1=GLOB.cultwords["destroy"]
+ R.word2=GLOB.cultwords["see"]
+ R.word3=GLOB.cultwords["other"]
R.loc = user.loc
R.check_icon()
if("bloodboil")
- R.word1=cultwords["destroy"]
- R.word2=cultwords["see"]
- R.word3=cultwords["blood"]
+ R.word1=GLOB.cultwords["destroy"]
+ R.word2=GLOB.cultwords["see"]
+ R.word3=GLOB.cultwords["blood"]
R.loc = user.loc
R.check_icon()
if("communicate")
- R.word1=cultwords["self"]
- R.word2=cultwords["other"]
- R.word3=cultwords["technology"]
+ R.word1=GLOB.cultwords["self"]
+ R.word2=GLOB.cultwords["other"]
+ R.word3=GLOB.cultwords["technology"]
R.loc = user.loc
R.check_icon()
if("stun")
- R.word1=cultwords["join"]
- R.word2=cultwords["hide"]
- R.word3=cultwords["technology"]
+ R.word1=GLOB.cultwords["join"]
+ R.word2=GLOB.cultwords["hide"]
+ R.word3=GLOB.cultwords["technology"]
R.loc = user.loc
R.check_icon()
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 17f49f50dc..26dcd1a9d0 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -20,7 +20,7 @@ var/list/sacrificed = list()
for(var/obj/effect/rune/R in rune_list)
if(R == src)
continue
- if(R.word1 == cultwords["travel"] && R.word2 == cultwords["self"] && R.word3 == key && isPlayerLevel(R.z))
+ if(R.word1 == GLOB.cultwords["travel"] && R.word2 == GLOB.cultwords["self"] && R.word3 == key && isPlayerLevel(R.z))
index++
allrunesloc.len = index
allrunesloc[index] = R.loc
@@ -54,7 +54,7 @@ var/list/sacrificed = list()
for(var/obj/effect/rune/R in rune_list)
if(R == src)
continue
- if(R.word1 == cultwords["travel"] && R.word2 == cultwords["other"] && R.word3 == key)
+ if(R.word1 == GLOB.cultwords["travel"] && R.word2 == GLOB.cultwords["other"] && R.word3 == key)
IP = R
runecount++
if(runecount >= 2)
@@ -160,7 +160,7 @@ var/list/sacrificed = list()
if (!target.can_feel_pain())
target.visible_message(span_warning("The markings below \the [target] glow a bloody red."))
else
- var/datum/gender/TT = gender_datums[target.get_visible_gender()]
+ var/datum/gender/TT = GLOB.gender_datums[target.get_visible_gender()]
target.visible_message(span_warning("[target] writhes in pain as the markings below [TT.him] glow a bloody red."), span_danger("AAAAAAHHHH!"), span_warning("You hear an anguished scream."))
if(!waiting_for_input[target]) //so we don't spam them with dialogs if they hesitate
@@ -235,7 +235,7 @@ var/list/sacrificed = list()
/obj/effect/rune/proc/drain()
var/drain = 0
for(var/obj/effect/rune/R in rune_list)
- if(R.word1==cultwords["travel"] && R.word2==cultwords["blood"] && R.word3==cultwords["self"])
+ if(R.word1==GLOB.cultwords["travel"] && R.word2==GLOB.cultwords["blood"] && R.word3==GLOB.cultwords["self"])
for(var/mob/living/carbon/D in R.loc)
if(D.stat!=2)
add_attack_logs(usr,D,"Blood drain rune")
@@ -335,7 +335,7 @@ var/list/sacrificed = list()
is_sacrifice_target = 0
find_sacrifice:
for(var/obj/effect/rune/R in rune_list)
- if(R.word1==cultwords["blood"] && R.word2==cultwords["join"] && R.word3==cultwords["hell"])
+ if(R.word1==GLOB.cultwords["blood"] && R.word2==GLOB.cultwords["join"] && R.word3==GLOB.cultwords["hell"])
for(var/mob/living/carbon/human/N in R.loc)
if(cult && N.mind && N.mind == cult.sacrifice_target)
is_sacrifice_target = 1
@@ -366,8 +366,8 @@ var/list/sacrificed = list()
if(corpse_to_raise.client)
- var/datum/gender/TU = gender_datums[corpse_to_raise.get_visible_gender()]
- var/datum/gender/TT = gender_datums[body_to_sacrifice.get_visible_gender()]
+ var/datum/gender/TU = GLOB.gender_datums[corpse_to_raise.get_visible_gender()]
+ var/datum/gender/TT = GLOB.gender_datums[body_to_sacrifice.get_visible_gender()]
cult.add_antagonist(corpse_to_raise.mind)
corpse_to_raise.revive()
@@ -423,7 +423,7 @@ var/list/sacrificed = list()
/obj/effect/rune/proc/ajourney() //some bits copypastaed from admin tools - Urist
if(usr.loc==src.loc)
var/mob/living/carbon/human/L = usr
- var/datum/gender/TU = gender_datums[L.get_visible_gender()]
+ var/datum/gender/TU = GLOB.gender_datums[L.get_visible_gender()]
usr.say("Fwe[pick("'","`")]sh mah erl nyag r'ya!")
usr.visible_message(span_warning("[usr]'s eyes glow blue as [TU.he] freeze[TU.s] in place, absolutely motionless."), \
span_warning("The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry..."), \
@@ -526,53 +526,53 @@ var/list/sacrificed = list()
for(var/obj/effect/rune/R in orange(1,src))
if(R==src)
continue
- if(R.word1==cultwords["travel"] && R.word2==cultwords["self"]) //teleport
+ if(R.word1==GLOB.cultwords["travel"] && R.word2==GLOB.cultwords["self"]) //teleport
T = new(src.loc)
T.imbue = "[R.word3]"
T.info = "[R.word3]"
imbued_from = R
break
- if(R.word1==cultwords["see"] && R.word2==cultwords["blood"] && R.word3==cultwords["hell"]) //tome
+ if(R.word1==GLOB.cultwords["see"] && R.word2==GLOB.cultwords["blood"] && R.word3==GLOB.cultwords["hell"]) //tome
T = new(src.loc)
T.imbue = "newtome"
imbued_from = R
break
- if(R.word1==cultwords["destroy"] && R.word2==cultwords["see"] && R.word3==cultwords["technology"]) //emp
+ if(R.word1==GLOB.cultwords["destroy"] && R.word2==GLOB.cultwords["see"] && R.word3==GLOB.cultwords["technology"]) //emp
T = new(src.loc)
T.imbue = "emp"
imbued_from = R
break
- if(R.word1==cultwords["blood"] && R.word2==cultwords["see"] && R.word3==cultwords["destroy"]) //conceal
+ if(R.word1==GLOB.cultwords["blood"] && R.word2==GLOB.cultwords["see"] && R.word3==GLOB.cultwords["destroy"]) //conceal
T = new(src.loc)
T.imbue = "conceal"
imbued_from = R
break
- if(R.word1==cultwords["hell"] && R.word2==cultwords["destroy"] && R.word3==cultwords["other"]) //armor
+ if(R.word1==GLOB.cultwords["hell"] && R.word2==GLOB.cultwords["destroy"] && R.word3==GLOB.cultwords["other"]) //armor
T = new(src.loc)
T.imbue = "armor"
imbued_from = R
break
- if(R.word1==cultwords["blood"] && R.word2==cultwords["see"] && R.word3==cultwords["hide"]) //reveal
+ if(R.word1==GLOB.cultwords["blood"] && R.word2==GLOB.cultwords["see"] && R.word3==GLOB.cultwords["hide"]) //reveal
T = new(src.loc)
T.imbue = "revealrunes"
imbued_from = R
break
- if(R.word1==cultwords["hide"] && R.word2==cultwords["other"] && R.word3==cultwords["see"]) //deafen
+ if(R.word1==GLOB.cultwords["hide"] && R.word2==GLOB.cultwords["other"] && R.word3==GLOB.cultwords["see"]) //deafen
T = new(src.loc)
T.imbue = "deafen"
imbued_from = R
break
- if(R.word1==cultwords["destroy"] && R.word2==cultwords["see"] && R.word3==cultwords["other"]) //blind
+ if(R.word1==GLOB.cultwords["destroy"] && R.word2==GLOB.cultwords["see"] && R.word3==GLOB.cultwords["other"]) //blind
T = new(src.loc)
T.imbue = "blind"
imbued_from = R
break
- if(R.word1==cultwords["self"] && R.word2==cultwords["other"] && R.word3==cultwords["technology"]) //communicat
+ if(R.word1==GLOB.cultwords["self"] && R.word2==GLOB.cultwords["other"] && R.word3==GLOB.cultwords["technology"]) //communicat
T = new(src.loc)
T.imbue = "communicate"
imbued_from = R
break
- if(R.word1==cultwords["join"] && R.word2==cultwords["hide"] && R.word3==cultwords["technology"]) //communicat
+ if(R.word1==GLOB.cultwords["join"] && R.word2==GLOB.cultwords["hide"] && R.word3==GLOB.cultwords["technology"]) //communicat
T = new(src.loc)
T.imbue = "runestun"
imbued_from = R
@@ -590,11 +590,11 @@ var/list/sacrificed = list()
/obj/effect/rune/proc/mend()
var/mob/living/user = usr
- var/datum/gender/TU = gender_datums[usr.get_visible_gender()]
+ var/datum/gender/TU = GLOB.gender_datums[usr.get_visible_gender()]
src = null
user.say("Uhrast ka'hfa heldsagen ver[pick("'","`")]lot!")
user.take_overall_damage(200, 0)
- runedec+=10
+ GLOB.runedec+=10
user.visible_message(span_danger("\The [user] keels over dead, [TU.his] blood glowing blue as it escapes [TU.his] body and dissipates into thin air."), \
span_danger("In the last moment of your humble life, you feel an immense pain as fabric of reality mends... with your blood."), \
span_warning("You hear faint rustle."))
@@ -602,7 +602,7 @@ var/list/sacrificed = list()
sleep(600)
if (!user)
return
- runedec-=10
+ GLOB.runedec-=10
return
@@ -878,7 +878,7 @@ var/list/sacrificed = list()
if (cultist == user) //just to be sure.
return
if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet)))
- var/datum/gender/TU = gender_datums[cultist.get_visible_gender()]
+ var/datum/gender/TU = GLOB.gender_datums[cultist.get_visible_gender()]
to_chat(user, span_warning("You cannot summon \the [cultist], for [TU.his] shackles of blood are strong."))
return fizzle()
cultist.loc = src.loc
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
index a08a6d3009..e0136f8a65 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
@@ -100,7 +100,7 @@
/turf/unsimulated/wall/supermatter/Bumped(atom/AM as mob|obj)
if(isliving(AM))
var/mob/living/M = AM
- var/datum/gender/T = gender_datums[M.get_visible_gender()]
+ var/datum/gender/T = GLOB.gender_datums[M.get_visible_gender()]
AM.visible_message(span_warning("\The [AM] slams into \the [src] inducing a resonance... [T.his] body starts to glow and catch flame before flashing into ash."),\
span_danger("You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\""),\
span_warning("You hear an unearthly noise as a wave of heat washes over you."))
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
index 6860c37b45..0fa5600776 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
@@ -1,4 +1,4 @@
-var/global/universe_has_ended = 0
+GLOBAL_VAR_INIT(universe_has_ended, 0)
/datum/universal_state/supermatter_cascade
@@ -79,7 +79,7 @@ var/global/universe_has_ended = 0
spawn(5 MINUTES)
ticker.station_explosion_cinematic(0,null) // TODO: Custom cinematic
- universe_has_ended = 1
+ GLOB.universe_has_ended = 1
return
/datum/universal_state/supermatter_cascade/proc/AreaSet()
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index e24ed45867..3dacb20b6a 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -98,8 +98,8 @@
if(15)
communications_blackout()
*/
-var/eventchance = 10 // Percent chance per 5 minutes.
-var/hadevent = 0
+GLOBAL_VAR_INIT(eventchance, 10) // Percent chance per 5 minutes.
+GLOBAL_VAR_INIT(hadevent, 0)
/proc/appendicitis()
for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm
index 62a1b19396..5fbb7c7d4c 100644
--- a/code/game/gamemodes/events/holidays/Holidays.dm
+++ b/code/game/gamemodes/events/holidays/Holidays.dm
@@ -297,7 +297,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
message_admins(span_notice("DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])"))*/
if("End of the World")
- if(prob(eventchance)) GameOver()
+ if(prob(GLOB.eventchance)) GameOver()
if("Christmas","Christmas Eve")
- if(prob(eventchance)) ChristmasEvent()
+ if(prob(GLOB.eventchance)) ChristmasEvent()
diff --git a/code/game/gamemodes/events/holidays/Other.dm b/code/game/gamemodes/events/holidays/Other.dm
index d6fe5b6ba1..8c054a8ac9 100644
--- a/code/game/gamemodes/events/holidays/Other.dm
+++ b/code/game/gamemodes/events/holidays/Other.dm
@@ -1,6 +1,6 @@
/proc/GameOver()
- if(!hadevent)
- hadevent = 1
+ if(!GLOB.hadevent)
+ GLOB.hadevent = 1
message_admins("The apocalypse has begun! (this holiday event can be disabled by toggling events off within 60 seconds)")
spawn(600)
if(!CONFIG_GET(flag/allow_random_events)) return
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 559547f677..183f3511a9 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -1,5 +1,5 @@
-var/global/antag_add_failed // Used in antag type voting.
-var/global/list/additional_antag_types = list()
+GLOBAL_VAR(antag_add_failed) // Used in antag type voting.
+GLOBAL_LIST_EMPTY(additional_antag_types)
/datum/game_mode
var/name = "invalid"
@@ -85,7 +85,7 @@ var/global/list/additional_antag_types = list()
if(href_list["debug_antag"] == "self")
usr.client.debug_variables(src)
return
- var/datum/antagonist/antag = all_antag_types[href_list["debug_antag"]]
+ var/datum/antagonist/antag = GLOB.all_antag_types[href_list["debug_antag"]]
if(antag)
usr.client.debug_variables(antag)
message_admins("Admin [key_name_admin(usr)] is debugging the [antag.role_text] template.")
@@ -93,16 +93,16 @@ var/global/list/additional_antag_types = list()
if(antag_tags && (href_list["remove_antag_type"] in antag_tags))
to_chat(usr, "Cannot remove core mode antag type.")
return
- var/datum/antagonist/antag = all_antag_types[href_list["remove_antag_type"]]
- if(antag_templates && antag_templates.len && antag && (antag in antag_templates) && (antag.id in additional_antag_types))
+ var/datum/antagonist/antag = GLOB.all_antag_types[href_list["remove_antag_type"]]
+ if(antag_templates && antag_templates.len && antag && (antag in antag_templates) && (antag.id in GLOB.additional_antag_types))
antag_templates -= antag
- additional_antag_types -= antag.id
+ GLOB.additional_antag_types -= antag.id
message_admins("Admin [key_name_admin(usr)] removed [antag.role_text] template from game mode.")
else if(href_list["add_antag_type"])
- var/choice = tgui_input_list(usr, "Which type do you wish to add?", "Select Antag Type", all_antag_types)
+ var/choice = tgui_input_list(usr, "Which type do you wish to add?", "Select Antag Type", GLOB.all_antag_types)
if(!choice)
return
- var/datum/antagonist/antag = all_antag_types[choice]
+ var/datum/antagonist/antag = GLOB.all_antag_types[choice]
if(antag)
if(!islist(ticker.mode.antag_templates))
ticker.mode.antag_templates = list()
@@ -160,7 +160,7 @@ var/global/list/additional_antag_types = list()
var/enemy_count = 0
if(antag_tags && antag_tags.len)
for(var/antag_tag in antag_tags)
- var/datum/antagonist/antag = all_antag_types[antag_tag]
+ var/datum/antagonist/antag = GLOB.all_antag_types[antag_tag]
if(!antag)
continue
var/list/potential = list()
@@ -417,7 +417,7 @@ var/global/list/additional_antag_types = list()
var/list/players = list()
var/list/candidates = list()
- var/datum/antagonist/antag_template = all_antag_types[antag_id]
+ var/datum/antagonist/antag_template = GLOB.all_antag_types[antag_id]
if(!antag_template)
return candidates
@@ -479,15 +479,15 @@ var/global/list/additional_antag_types = list()
if(antag_tags && antag_tags.len)
antag_templates = list()
for(var/antag_tag in antag_tags)
- var/datum/antagonist/antag = all_antag_types[antag_tag]
+ var/datum/antagonist/antag = GLOB.all_antag_types[antag_tag]
if(antag)
antag_templates |= antag
- if(additional_antag_types && additional_antag_types.len)
+ if(GLOB.additional_antag_types && GLOB.additional_antag_types.len)
if(!antag_templates)
antag_templates = list()
- for(var/antag_type in additional_antag_types)
- var/datum/antagonist/antag = all_antag_types[antag_type]
+ for(var/antag_type in GLOB.additional_antag_types)
+ var/datum/antagonist/antag = GLOB.all_antag_types[antag_type]
if(antag)
antag_templates |= antag
diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
index f71e1f732c..4a1e3b3a69 100644
--- a/code/game/gamemodes/meteor/meteor.dm
+++ b/code/game/gamemodes/meteor/meteor.dm
@@ -16,7 +16,7 @@
/datum/game_mode/meteor/process()
if(world.time >= next_wave)
- next_wave = world.time + meteor_wave_delay
+ next_wave = world.time + GLOB.meteor_wave_delay
spawn() spawn_meteors(6, meteors_normal)
/datum/game_mode/meteor/declare_completion()
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 976e01a58c..99df9683a4 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -1,4 +1,4 @@
-/var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds
+GLOBAL_VAR_INIT(meteor_wave_delay, 625) //minimum wait between waves in tenths of seconds
//set to at least 100 unless you want evarr ruining every round
//Meteors probability of spawning during a given wave
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 9d60efdb65..0e460f6bfa 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -2,7 +2,7 @@
MERCENARY ROUNDTYPE
*/
-var/list/nuke_disks = list()
+GLOBAL_LIST_EMPTY(nuke_disks)
/datum/game_mode/nuclear
name = "Mercenary"
@@ -22,12 +22,12 @@ var/list/nuke_disks = list()
//delete all nuke disks not on a station zlevel
/datum/game_mode/nuclear/proc/check_nuke_disks()
- for(var/obj/item/disk/nuclear/N in nuke_disks)
+ for(var/obj/item/disk/nuclear/N in GLOB.nuke_disks)
if(isNotStationLevel(N.z)) qdel(N)
//checks if L has a nuke disk on their person
/datum/game_mode/nuclear/proc/check_mob(mob/living/L)
- for(var/obj/item/disk/nuclear/N in nuke_disks)
+ for(var/obj/item/disk/nuclear/N in GLOB.nuke_disks)
if(N.storage_depth(L) >= 0)
return 1
return 0
@@ -37,7 +37,7 @@ var/list/nuke_disks = list()
..()
return
var/disk_rescued = 1
- for(var/obj/item/disk/nuclear/D in nuke_disks)
+ for(var/obj/item/disk/nuclear/D in GLOB.nuke_disks)
var/disk_area = get_area(D)
if(!is_type_in_list(disk_area, centcom_areas))
disk_rescued = 0
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index b219399753..47324dbaa8 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -212,7 +212,7 @@
worklocation()
/obj/item/pinpointer/nukeop/proc/workdisk()
- if(bomb_set) //If the bomb is set, lead to the shuttle
+ if(GLOB.bomb_set) //If the bomb is set, lead to the shuttle
mode = 1 //Ensures worklocation() continues to work
playsound(src, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep
visible_message(span_notice("Shuttle Locator active.")) //Lets the mob holding it know that the mode has changed
@@ -237,7 +237,7 @@
icon_state = "pinonfar"
/obj/item/pinpointer/nukeop/proc/worklocation()
- if(!bomb_set)
+ if(!GLOB.bomb_set)
mode = 0
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
visible_message(span_notice("Authentication Disk Locator active."))
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 4f0d42fb34..967bcf908e 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -1,5 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-var/global/list/all_objectives = list()
+GLOBAL_LIST_EMPTY(all_objectives)
/datum/objective
var/datum/mind/owner = null //Who owns the objective.
@@ -9,13 +9,13 @@ var/global/list/all_objectives = list()
var/completed = 0 //currently only used for custom objectives.
/datum/objective/New(var/text)
- all_objectives |= src
+ GLOB.all_objectives |= src
if(text)
explanation_text = text
..()
/datum/objective/Destroy()
- all_objectives -= src
+ GLOB.all_objectives -= src
. = ..()
/datum/objective/proc/check_completion()
@@ -67,7 +67,7 @@ var/global/list/all_objectives = list()
/datum/objective/anti_revolution/execute/find_target()
..()
if(target && target.current)
- var/datum/gender/T = gender_datums[target.current.get_visible_gender()]
+ var/datum/gender/T = GLOB.gender_datums[target.current.get_visible_gender()]
explanation_text = "[target.current.real_name], the [target.assigned_role] has extracted confidential information above their clearance. Execute [T.him]."
else
explanation_text = "Free Objective"
@@ -77,7 +77,7 @@ var/global/list/all_objectives = list()
/datum/objective/anti_revolution/execute/find_target_by_role(role, role_type=0)
..(role, role_type)
if(target && target.current)
- var/datum/gender/T = gender_datums[target.current.get_visible_gender()]
+ var/datum/gender/T = GLOB.gender_datums[target.current.get_visible_gender()]
explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has extracted confidential information above their clearance. Execute [T.him]."
else
explanation_text = "Free Objective"
@@ -126,7 +126,7 @@ var/global/list/all_objectives = list()
/datum/objective/anti_revolution/demote/find_target()
..()
if(target && target.current)
- var/datum/gender/T = gender_datums[target.current.get_visible_gender()]
+ var/datum/gender/T = GLOB.gender_datums[target.current.get_visible_gender()]
explanation_text = "[target.current.real_name], the [target.assigned_role] has been classified as harmful to [using_map.company_name]'s goals. Demote [T.him] to assistant."
else
explanation_text = "Free Objective"
@@ -135,7 +135,7 @@ var/global/list/all_objectives = list()
/datum/objective/anti_revolution/demote/find_target_by_role(role, role_type=0)
..(role, role_type)
if(target && target.current)
- var/datum/gender/T = gender_datums[target.current.get_visible_gender()]
+ var/datum/gender/T = GLOB.gender_datums[target.current.get_visible_gender()]
explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to [using_map.company_name]'s goals. Demote [T.him] to assistant."
else
explanation_text = "Free Objective"
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index db935e35a4..63178a9cd9 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -57,7 +57,7 @@
var/summery = ""
for(var/path in gene.conflict_traits)
if(gene.conflict_traits[path]) // check if it actually conflicts
- var/datum/trait/T = all_traits[path]
+ var/datum/trait/T = GLOB.all_traits[path]
if(summery != "")
summery += ", "
summery += "[T.name]"
diff --git a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm
index f514b75e5a..263f74491b 100644
--- a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm
+++ b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm
@@ -31,10 +31,10 @@
to_chat(user, span_danger("\The [src] has ran out of uses, and is now useless to you!"))
return
else
- var/area_wanted = tgui_input_list(user, "Area to teleport to", "Teleportation", teleportlocs)
+ var/area_wanted = tgui_input_list(user, "Area to teleport to", "Teleportation", GLOB.teleportlocs)
if(!area_wanted)
return
- var/area/A = teleportlocs[area_wanted]
+ var/area/A = GLOB.teleportlocs[area_wanted]
if(!A)
return
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index aedd61cd82..013c5a0124 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -237,7 +237,7 @@
return C.registered_name
/proc/get_all_job_icons() //For all existing HUD icons
- return joblist + alt_titles_with_icons + list("Prisoner")
+ return joblist + GLOB.alt_titles_with_icons + list("Prisoner")
/obj/proc/GetJobName() //Used in secHUD icon generation
var/obj/item/card/id/I = GetID()
diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index e0051c5f89..ba0ea0ae60 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -33,7 +33,7 @@
return 1
/datum/job/ai/is_position_available()
- return (empty_playable_ai_cores.len != 0)
+ return (GLOB.empty_playable_ai_cores.len != 0)
/datum/job/ai/equip_preview(mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/straight_jacket(H), slot_wear_suit)
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 6824014d3b..4ed1a9cde2 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -494,7 +494,7 @@ var/global/datum/controller/occupations/job_master
if(H.mind && job.department_accounts)
var/remembered_info = ""
for(var/D in job.department_accounts)
- var/datum/money_account/department_account = department_accounts[D]
+ var/datum/money_account/department_account = GLOB.department_accounts[D]
if(department_account)
remembered_info += span_bold("Department account number ([D]):") + " #[department_account.account_number] " remembered_info += span_bold("Department account pin ([D]):") + " [department_account.remote_access_pin] " diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 7facdf3cdc..6a7388d65b 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -1,6 +1,6 @@ #define WHITELISTFILE "data/whitelist.txt" -GLOBAL_LIST_EMPTY(whitelist) // CHOMPEdit - Managed Globals +GLOBAL_LIST_EMPTY(whitelist) /hook/startup/proc/loadWhitelist() if(CONFIG_GET(flag/usewhitelist)) @@ -8,17 +8,19 @@ GLOBAL_LIST_EMPTY(whitelist) // CHOMPEdit - Managed Globals return 1 /proc/load_whitelist() - GLOB.whitelist = file2list(WHITELISTFILE) // CHOMPEdit - Managed Globals - if(!GLOB.whitelist.len) GLOB.whitelist = null // CHOMPEdit - Managed Globals + GLOB.whitelist = file2list(WHITELISTFILE) + if(!GLOB.whitelist.len) GLOB.whitelist = null /proc/check_whitelist(mob/M /*, var/rank*/) - if(!CONFIG_GET(flag/usewhitelist)) //CHOMPedit: I guess this is an override for the blanket whitelist system. - return 1 //CHOMPedit - if(!GLOB.whitelist) // CHOMPEdit - Managed Globals + // CHOMPAdd Start + if(!CONFIG_GET(flag/usewhitelist)) //I guess this is an override for the blanket whitelist system. + return 1 + // CHOMPAdd End + if(!GLOB.whitelist) return 0 - return ("[M.ckey]" in GLOB.whitelist) // CHOMPEdit - Managed Globals + return ("[M.ckey]" in GLOB.whitelist) -GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals +GLOBAL_LIST_EMPTY(alien_whitelist) /hook/startup/proc/loadAlienWhitelist() if(CONFIG_GET(flag/usealienwhitelist)) @@ -40,10 +42,10 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals if(key != ckey(key)) warning("Alien whitelist entry appears to have key, not ckey: [line]") // The key contains invalid ckey characters continue - var/list/our_whitelists = GLOB.alien_whitelist[key] // Try to see if we have one already and add to it // CHOMPEdit - Managed Globals + var/list/our_whitelists = GLOB.alien_whitelist[key] // Try to see if we have one already and add to it if(!our_whitelists) // Guess this is their first/only whitelist entry our_whitelists = list() - GLOB.alien_whitelist[key] = our_whitelists // CHOMPEdit - Managed Globals + GLOB.alien_whitelist[key] = our_whitelists our_whitelists += left_and_right[2] /proc/is_alien_whitelisted(client/C, var/datum/species/species) @@ -60,7 +62,7 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals return TRUE //Search the whitelist - var/list/our_whitelists = GLOB.alien_whitelist[C.ckey] // CHOMPEdit - Managed Globals + var/list/our_whitelists = GLOB.alien_whitelist[C.ckey] if("All" in our_whitelists) return TRUE if(species.name in our_whitelists) @@ -83,7 +85,7 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals return TRUE //Search the whitelist - var/list/our_whitelists = GLOB.alien_whitelist[M.ckey] // CHOMPEdit - Managed Globals + var/list/our_whitelists = GLOB.alien_whitelist[M.ckey] if("All" in our_whitelists) return TRUE if(language.name in our_whitelists) @@ -105,8 +107,8 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals return 1 //If we have a loaded file, search it - if(GLOB.alien_whitelist) // CHOMPEdit - Managed Globals - for (var/s in GLOB.alien_whitelist) // CHOMPEdit - Managed Globals + if(GLOB.alien_whitelist) + for (var/s in GLOB.alien_whitelist) if(findtext(s,"[M.ckey] - [module]")) return 1 if(findtext(s,"[M.ckey] - All")) diff --git a/code/game/jobs/whitelist_vr.dm b/code/game/jobs/whitelist_vr.dm index 8ad955f559..1dc196a393 100644 --- a/code/game/jobs/whitelist_vr.dm +++ b/code/game/jobs/whitelist_vr.dm @@ -1,4 +1,4 @@ -GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals +GLOBAL_LIST_EMPTY(job_whitelist) /hook/startup/proc/loadJobWhitelist() if(CONFIG_GET(flag/use_jobwhitelist)) // CHOMPedit @@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals if (!text) log_misc("Failed to load config/jobwhitelist.txt") else - GLOB.job_whitelist = splittext(text, "\n") // CHOMPEdit - Managed Globals + GLOB.job_whitelist = splittext(text, "\n") /proc/is_job_whitelisted(mob/M, var/rank) if(!CONFIG_GET(flag/use_jobwhitelist)) // CHOMPedit @@ -22,10 +22,10 @@ GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals return 1 if(check_rights(R_ADMIN, 0) || check_rights(R_DEBUG, 0) || check_rights(R_EVENT, 0)) // CHOMPedit return 1 - if(!GLOB.job_whitelist) // CHOMPEdit - Managed Globals + if(!GLOB.job_whitelist) return 0 if(M && rank) - for (var/s in GLOB.job_whitelist) // CHOMPEdit - Managed Globals + for (var/s in GLOB.job_whitelist) if(findtext(s,"[lowertext(M.ckey)] - [lowertext(rank)]")) return 1 if(findtext(s,"[M.ckey] - All")) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 8c09817767..057e60d682 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -308,7 +308,7 @@ if(!occupant) return if(occupant.stat == DEAD) - var/datum/gender/G = gender_datums[occupant.get_visible_gender()] + var/datum/gender/G = GLOB.gender_datums[occupant.get_visible_gender()] to_chat(ui.user, span_danger("This person has no life to preserve anymore. Take [G.him] to a department capable of reanimating [G.him].")) return var/chemical = params["chemid"] diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 118138c77d..4ae0b6afc7 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -1,6 +1,6 @@ // PRESETS /* -var/global/list/station_networks = list( +GLOBAL_LIST_INIT(station_networks, list( // NETWORK_CAFE_DOCK, NETWORK_CARGO, NETWORK_CIVILIAN, @@ -20,16 +20,16 @@ var/global/list/station_networks = list( NETWORK_PRISON, NETWORK_SECURITY, NETWORK_INTERROGATION - ) + )) */ -var/global/list/engineering_networks = list( +GLOBAL_LIST_INIT(engineering_networks, list( NETWORK_ENGINE, NETWORK_SUBSTATIONS, //YAWN ADD: new substations subnet NETWORK_ENGINEERING, //NETWORK_ENGINEERING_OUTPOST, //VOREStation Edit: Tether has no Engineering Outpost, NETWORK_ALARM_ATMOS, NETWORK_ALARM_FIRE, - NETWORK_ALARM_POWER) + NETWORK_ALARM_POWER)) /obj/machinery/camera/network/crescent network = list(NETWORK_CRESCENT) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 6bf137a670..21880fda24 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -177,7 +177,7 @@ var/open_for_latejoin = tgui_alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", list("Yes", "No")) == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) if(open_for_latejoin) - empty_playable_ai_cores += D + GLOB.empty_playable_ai_cores += D else var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(loc, FALSE, laws, brain) if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created @@ -197,8 +197,8 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva state = 20//So it doesn't interact based on the above. Not really necessary. /obj/structure/AIcore/deactivated/Destroy() - if(src in empty_playable_ai_cores) - empty_playable_ai_cores -= src + if(src in GLOB.empty_playable_ai_cores) + GLOB.empty_playable_ai_cores -= src return ..() /obj/structure/AIcore/deactivated/proc/load_ai(var/mob/living/silicon/ai/transfer, var/obj/item/aicard/card, var/mob/user) @@ -274,9 +274,9 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva var/obj/structure/AIcore/deactivated/D = cores[id] if(!D) return - if(D in empty_playable_ai_cores) - empty_playable_ai_cores -= D + if(D in GLOB.empty_playable_ai_cores) + GLOB.empty_playable_ai_cores -= D to_chat(src, "\The [id] is now [span_red("not available")] for latejoining AIs.") else - empty_playable_ai_cores += D + GLOB.empty_playable_ai_cores += D to_chat(src, "\The [id] is now [span_green("available")] for latejoining AIs.") diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index c145239480..3d8e75d9c0 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1108,7 +1108,7 @@ if(..()) return - if(gamepaid == 0 && vendor_account && !vendor_account.suspended) + if(gamepaid == 0 && GLOB.vendor_account && !GLOB.vendor_account.suspended) var/paid = 0 var/obj/item/card/id/W = I.GetID() if(W) //for IDs and PDAs and wallets with IDs @@ -1208,14 +1208,14 @@ // create entry in the purchaser's account log var/datum/transaction/T = new() - T.target_name = "[vendor_account.owner_name] (via [name])" + T.target_name = "[GLOB.vendor_account.owner_name] (via [name])" T.purpose = "Purchase of arcade game([name])" if(gameprice > 0) T.amount = "([gameprice])" else T.amount = "[gameprice]" T.source_terminal = name - T.date = current_date_string + T.date = GLOB.current_date_string T.time = stationtime2text() customer_account.transaction_log.Add(T) @@ -1228,16 +1228,16 @@ /// Add to vendor account /obj/machinery/computer/arcade/clawmachine/proc/credit_purchase(var/target as text) - vendor_account.money += gameprice + GLOB.vendor_account.money += gameprice var/datum/transaction/T = new() T.target_name = target T.purpose = "Purchase of arcade game([name])" T.amount = "[gameprice]" T.source_terminal = name - T.date = current_date_string + T.date = GLOB.current_date_string T.time = stationtime2text() - vendor_account.transaction_log.Add(T) + GLOB.vendor_account.transaction_log.Add(T) /// End Payment /obj/machinery/computer/arcade/clawmachine/attack_hand(mob/living/user) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index f9aefe97d4..516d95faec 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -339,7 +339,7 @@ GLOBAL_LIST_EMPTY(bodycamera_screens) // CHOMPEdit light_color = "#FAC54B" /obj/machinery/computer/security/engineering/get_default_networks() - . = engineering_networks.Copy() + . = GLOB.engineering_networks.Copy() /obj/machinery/computer/security/nuclear name = "head mounted camera monitor" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index c4dd7558dc..0bb006e23e 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -89,7 +89,7 @@ var/list/data = ..() if(data_core) data_core.get_manifest_list() - data["manifest"] = PDA_Manifest + data["manifest"] = GLOB.PDA_Manifest return data /obj/machinery/computer/card/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 78e7b5bb3c..1302289566 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -499,8 +499,8 @@ R.fields["b_type"] = pick("A-", "B-", "AB-", "O-", "A+", "B+", "AB+", "O+") if(5) R.fields["p_stat"] = pick("*SSD*", "Active", "Physically Unfit", "Disabled") - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() if(6) R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") continue diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 77bd30820c..a3f03dcd9c 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -55,7 +55,7 @@ if((get_z(L) in using_map.station_levels) && !istype(L.loc, /turf/space)) loc_display = T.loc if(track.malfunction) - loc_display = pick(teleportlocs) + loc_display = pick(GLOB.teleportlocs) trackImplants.Add(list(list( "host" = L, "ref" = "\ref[track]", diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index b09328ab82..ababe6e073 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -3,12 +3,12 @@ #define PRISON_STATION_AREATYPE "/area/shuttle/prison/station" //Type of the prison shuttle area for station #define PRISON_DOCK_AREATYPE "/area/shuttle/prison/prison" //Type of the prison shuttle area for dock -var/prison_shuttle_moving_to_station = 0 -var/prison_shuttle_moving_to_prison = 0 -var/prison_shuttle_at_station = 0 -var/prison_shuttle_can_send = 1 -var/prison_shuttle_time = 0 -var/prison_shuttle_timeleft = 0 +GLOBAL_VAR_INIT(prison_shuttle_moving_to_station, 0) +GLOBAL_VAR_INIT(prison_shuttle_moving_to_prison, 0) +GLOBAL_VAR_INIT(prison_shuttle_at_station, 0) +GLOBAL_VAR_INIT(prison_shuttle_can_send, 1) +GLOBAL_VAR_INIT(prison_shuttle_time, 0) +GLOBAL_VAR_INIT(prison_shuttle_timeleft, 0) /obj/machinery/computer/prison_shuttle name = "prison shuttle control console" @@ -42,8 +42,8 @@ var/prison_shuttle_timeleft = 0 dat = src.temp else dat += {" Prison Shuttle - \nLocation: [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "Moving to station ([prison_shuttle_timeleft] Secs.)":prison_shuttle_at_station ? "Station":"Dock"] - [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "\n*Shuttle already called* \n ":prison_shuttle_at_station ? "\nSend to Dock \n ":"\nSend to station \n "] + \nLocation: [GLOB.prison_shuttle_moving_to_station || GLOB.prison_shuttle_moving_to_prison ? "Moving to station ([GLOB.prison_shuttle_timeleft] Secs.)":GLOB.prison_shuttle_at_station ? "Station":"Dock"] + [GLOB.prison_shuttle_moving_to_station || GLOB.prison_shuttle_moving_to_prison ? "\n*Shuttle already called* \n ":GLOB.prison_shuttle_at_station ? "\nSend to Dock \n ":"\nSend to station \n "] \nClose"} user << browse("[dat]", "window=computer;size=575x450") @@ -62,13 +62,13 @@ var/prison_shuttle_timeleft = 0 if (!prison_can_move()) to_chat(usr, span_warning("The prison shuttle is unable to leave.")) return - if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return + if(!GLOB.prison_shuttle_at_station|| GLOB.prison_shuttle_moving_to_station || GLOB.prison_shuttle_moving_to_prison) return post_signal("prison") to_chat(usr, span_notice("The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")) src.temp += "Shuttle sent. OK" src.updateUsrDialog(usr) - prison_shuttle_moving_to_prison = 1 - prison_shuttle_time = world.timeofday + PRISON_MOVETIME + GLOB.prison_shuttle_moving_to_prison = 1 + GLOB.prison_shuttle_time = world.timeofday + PRISON_MOVETIME spawn(0) prison_process() @@ -76,13 +76,13 @@ var/prison_shuttle_timeleft = 0 if (!prison_can_move()) to_chat(usr, span_warning("The prison shuttle is unable to leave.")) return - if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return + if(GLOB.prison_shuttle_at_station || GLOB.prison_shuttle_moving_to_station || GLOB.prison_shuttle_moving_to_prison) return post_signal("prison") to_chat(usr, span_notice("The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")) src.temp += "Shuttle sent. OK" src.updateUsrDialog(usr) - prison_shuttle_moving_to_station = 1 - prison_shuttle_time = world.timeofday + PRISON_MOVETIME + GLOB.prison_shuttle_moving_to_station = 1 + GLOB.prison_shuttle_time = world.timeofday + PRISON_MOVETIME spawn(0) prison_process() @@ -95,20 +95,20 @@ var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle/proc/prison_can_move() - if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return 0 + if(GLOB.prison_shuttle_moving_to_station || GLOB.prison_shuttle_moving_to_prison) return 0 else return 1 /obj/machinery/computer/prison_shuttle/proc/prison_break() switch(prison_break) if (0) - if(!prison_shuttle_at_station || prison_shuttle_moving_to_prison) return + if(!GLOB.prison_shuttle_at_station || GLOB.prison_shuttle_moving_to_prison) return - prison_shuttle_moving_to_prison = 1 - prison_shuttle_at_station = prison_shuttle_at_station + GLOB.prison_shuttle_moving_to_prison = 1 + GLOB.prison_shuttle_at_station = GLOB.prison_shuttle_at_station - if (!prison_shuttle_moving_to_prison || !prison_shuttle_moving_to_station) - prison_shuttle_time = world.timeofday + PRISON_MOVETIME + if (!GLOB.prison_shuttle_moving_to_prison || !GLOB.prison_shuttle_moving_to_station) + GLOB.prison_shuttle_time = world.timeofday + PRISON_MOVETIME spawn(0) prison_process() prison_break = 1 @@ -128,22 +128,22 @@ var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle/proc/prison_process() - while(prison_shuttle_time - world.timeofday > 0) - var/ticksleft = prison_shuttle_time - world.timeofday + while(GLOB.prison_shuttle_time - world.timeofday > 0) + var/ticksleft = GLOB.prison_shuttle_time - world.timeofday if(ticksleft > 1e5) - prison_shuttle_time = world.timeofday + 10 // midnight rollover + GLOB.prison_shuttle_time = world.timeofday + 10 // midnight rollover - prison_shuttle_timeleft = (ticksleft / 10) + GLOB.prison_shuttle_timeleft = (ticksleft / 10) sleep(5) - prison_shuttle_moving_to_station = 0 - prison_shuttle_moving_to_prison = 0 + GLOB.prison_shuttle_moving_to_station = 0 + GLOB.prison_shuttle_moving_to_prison = 0 - switch(prison_shuttle_at_station) + switch(GLOB.prison_shuttle_at_station) if(0) - prison_shuttle_at_station = 1 - if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return + GLOB.prison_shuttle_at_station = 1 + if (GLOB.prison_shuttle_moving_to_station || GLOB.prison_shuttle_moving_to_prison) return if (!prison_can_move()) to_chat(usr, span_warning("The prison shuttle is unable to leave.")) @@ -171,8 +171,8 @@ var/prison_shuttle_timeleft = 0 start_location.move_contents_to(end_location) if(1) - prison_shuttle_at_station = 0 - if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return + GLOB.prison_shuttle_at_station = 0 + if (GLOB.prison_shuttle_moving_to_station || GLOB.prison_shuttle_moving_to_prison) return if (!prison_can_move()) to_chat(usr, span_warning("The prison shuttle is unable to leave.")) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index d3179e8e57..4399559d74 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -507,8 +507,8 @@ R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released") if(5) R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() if(6) R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") continue diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 81aa6d0522..bfab1cb8b8 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -209,8 +209,8 @@ screen = clamp(text2num(params["screen"]) || 0, GENERAL_RECORD_LIST, GENERAL_RECORD_MAINT) active1 = null if("del_all") - if(PDA_Manifest) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest) + GLOB.PDA_Manifest.Cut() for(var/datum/data/record/R in data_core.general) qdel(R) set_temp("All employment records deleted.") @@ -225,8 +225,8 @@ if(ui.user.Adjacent(src)) active1.fields["notes"] = new_notes if("del_r") - if(PDA_Manifest) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest) + GLOB.PDA_Manifest.Cut() if(active1) for(var/datum/data/record/R in data_core.medical) if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) @@ -242,8 +242,8 @@ active1 = general_record screen = GENERAL_RECORD_DATA if("new") - if(PDA_Manifest) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest) + GLOB.PDA_Manifest.Cut() active1 = data_core.CreateGeneralRecord() screen = GENERAL_RECORD_DATA set_temp("Employment record created.", "success") @@ -384,8 +384,8 @@ R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released") if(5) R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() if(6) R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") continue diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index 1077108894..f80a45158e 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -177,7 +177,7 @@ pack_list.Add(list(pack)) data["supply_packs"] = pack_list - data["categories"] = all_supply_groups + data["categories"] = GLOB.all_supply_groups return data /obj/machinery/computer/supplycomp/tgui_act(action, params, datum/tgui/ui) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 93fa7c826a..bb1e0d74da 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -470,7 +470,7 @@ qdel(B) //Update any existing objectives involving this mob. - for(var/datum/objective/O in all_objectives) + for(var/datum/objective/O in GLOB.all_objectives) // We don't want revs to get objectives that aren't for heads of staff. Letting // them win or lose based on cryo is silly so we remove the objective. if(O.target == to_despawn.mind) @@ -502,8 +502,8 @@ // Delete them from datacore. - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() for(var/datum/data/record/R in data_core.medical) if((R.fields["name"] == to_despawn.real_name)) qdel(R) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index fff5cc2e70..ec110438cd 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -1,4 +1,4 @@ -var/list/doppler_arrays = list() +GLOBAL_LIST_EMPTY(doppler_arrays) /obj/machinery/doppler_array anchored = TRUE @@ -11,10 +11,10 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/Initialize(mapload) . = ..() - doppler_arrays += src + GLOB.doppler_arrays += src /obj/machinery/doppler_array/Destroy() - doppler_arrays -= src + GLOB.doppler_arrays -= src . = ..() /obj/machinery/doppler_array/proc/sense_explosion(var/x0,var/y0,var/z0,var/devastation_range,var/heavy_impact_range,var/light_impact_range,var/took) diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 7eaef94df5..16b41e7533 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -59,7 +59,7 @@ FIRE ALARM offset_alarm() if(z in using_map.contact_levels) - set_security_level(security_level ? get_security_level() : "green") + set_security_level(GLOB.security_level ? get_security_level() : "green") soundloop = new(list(src), FALSE) // CHOMPEdit: Create soundloop engalarm = new(list(src), FALSE) // CHOMPEdit: Create soundloop diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index 9d68cd33bc..b20ea2c9b5 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -1,16 +1,16 @@ -/var/global/list/construction_frame_wall -/var/global/list/construction_frame_floor +GLOBAL_LIST(construction_frame_wall) +GLOBAL_LIST(construction_frame_floor) /proc/populate_frame_types() //Create global frame type list if it hasn't been made already. - construction_frame_wall = list() - construction_frame_floor = list() + GLOB.construction_frame_wall = list() + GLOB.construction_frame_floor = list() for(var/R in subtypesof(/datum/frame/frame_types)) var/datum/frame/frame_types/type = new R if(type.frame_style == FRAME_STYLE_WALL) - construction_frame_wall += type + GLOB.construction_frame_wall += type else - construction_frame_floor += type + GLOB.construction_frame_floor += type ////////////////////////////// // Frame Type Datum - Describes the frame structures that can be created from a frame item. diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index 44f5ebac85..65a4f6b228 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -8,7 +8,7 @@ #define GD_UNLIMITED 8 // will not deplete amount when gear is taken #define GD_UNIQUE 16 // each instance of this will allow people to take 1 thing -var/list/dispenser_presets = list() +GLOBAL_LIST_EMPTY(dispenser_presets) // Standard generic item list /datum/gear_disp diff --git a/code/game/machinery/holoposter.dm b/code/game/machinery/holoposter.dm index dd84e6e64c..eea5c071a9 100644 --- a/code/game/machinery/holoposter.dm +++ b/code/game/machinery/holoposter.dm @@ -54,12 +54,12 @@ GLOBAL_LIST_EMPTY(holoposters) examine_addon = "It appears to be malfunctioning." new_color = "#6A6C71" else - if((z in using_map.station_levels) && global.security_level) // 0 is fine, everything higher is alert levels + if((z in using_map.station_levels) && GLOB.security_level) // 0 is fine, everything higher is alert levels icon_state = "attention" examine_addon = "It warns you to remain calm and contact your supervisor as soon as possible." new_color = "#AA7039" alerting = TRUE - else if(alerting && !global.security_level) // coming out of alert + else if(alerting && !GLOB.security_level) // coming out of alert alerting = FALSE set_rand_sprite() return diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 7502d9f01b..7a7a540dab 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -1,7 +1,7 @@ // Navigation beacon for AI robots // Functions as a transponder: looks for incoming signal matching -var/global/list/navbeacons = list() // no I don't like putting this in, but it will do for now +GLOBAL_LIST_EMPTY(navbeacons) // no I don't like putting this in, but it will do for now /obj/machinery/navbeacon icon = 'icons/obj/objects.dmi' @@ -26,7 +26,7 @@ var/global/list/navbeacons = list() // no I don't like putting this in, but it w var/turf/T = loc hide(!T.is_plating()) - navbeacons += src + GLOB.navbeacons += src // set the transponder codes assoc list from codes_txt // DEPRECATED - This is kept only for compatibilty with old map files! Do not use this! @@ -201,7 +201,7 @@ Transponder Codes:
" dat += " " - for(var/antag_type in all_antag_types) - var/datum/antagonist/A = all_antag_types[antag_type] + for(var/antag_type in GLOB.all_antag_types) + var/datum/antagonist/A = GLOB.all_antag_types[antag_type] dat += A.get_check_antag_output(src) dat += " |