"
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index e7559f3aa4fd..e31d372743c5 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -1,4 +1,4 @@
-var/list/datum/admins/admin_datums = list()
+GLOBAL_LIST_INIT_TYPED(admin_datums, /datum/admins, list())
GLOBAL_VAR_INIT(href_token, GenerateToken())
GLOBAL_PROTECT(href_token)
@@ -35,7 +35,7 @@ GLOBAL_PROTECT(href_token)
rank = initial_rank
rights = initial_rights
href_token = GenerateToken()
- admin_datums[ckey] = src
+ GLOB.admin_datums[ckey] = src
extra_titles = new_extra_titles
// Letting admins edit their own permission giver is a poor idea
@@ -138,8 +138,8 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your
return TRUE
/client/proc/readmin()
- if(admin_datums[ckey])
- admin_datums[ckey].associate(src)
+ if(GLOB.admin_datums[ckey])
+ GLOB.admin_datums[ckey].associate(src)
return TRUE
/datum/admins/proc/check_for_rights(rights_required)
diff --git a/code/modules/admin/player_panel/actions/physical.dm b/code/modules/admin/player_panel/actions/physical.dm
index a48f39e81a5e..eb43fe5d2aa8 100644
--- a/code/modules/admin/player_panel/actions/physical.dm
+++ b/code/modules/admin/player_panel/actions/physical.dm
@@ -90,15 +90,15 @@
if(SKILL_SPEC_SNIPER)
set_name = "Sniper Set"
- if(set_name && !available_specialist_sets.Find(set_name))
- available_specialist_sets += set_name
+ if(set_name && !GLOB.available_specialist_sets.Find(set_name))
+ GLOB.available_specialist_sets += set_name
S.forget_marine_in_squad(H)
message_admins("[key_name_admin(user)] sent [key_name_admin(target)] ([H.job]) to cryogenics.")
SSticker.mode.latejoin_tally-- //Cryoing someone out removes someone from the Marines, blocking further larva spawns until accounted for
//Handle job slot/tater cleanup.
- RoleAuthority.free_role(RoleAuthority.roles_for_mode[target.job], TRUE)
+ GLOB.RoleAuthority.free_role(GLOB.RoleAuthority.roles_for_mode[target.job], TRUE)
//Delete them from datacore.
var/target_ref = WEAKREF(target)
@@ -200,7 +200,7 @@
/datum/player_action/set_squad/act(client/user, mob/living/carbon/human/target, list/params)
var/list/squads = list()
- for(var/datum/squad/S in RoleAuthority.squads)
+ for(var/datum/squad/S in GLOB.RoleAuthority.squads)
squads[S.name] = S
var/selected_squad = tgui_input_list(user, "Select a squad.", "Squad Selection", squads)
diff --git a/code/modules/admin/player_panel/player_panel.dm b/code/modules/admin/player_panel/player_panel.dm
index 4b79c8c91569..f131906732b3 100644
--- a/code/modules/admin/player_panel/player_panel.dm
+++ b/code/modules/admin/player_panel/player_panel.dm
@@ -389,7 +389,7 @@
dat += "Round Duration:
[round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10]"
if(check_rights(R_DEBUG, 0))
- dat += "
VV Shuttle Controller"
+ dat += "
VV Shuttle Controller"
if(check_rights(R_MOD, 0))
dat += "
Evacuation Goals: "
diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm
index e0a8c540ea85..cc927a62d3b0 100644
--- a/code/modules/admin/tabs/admin_tab.dm
+++ b/code/modules/admin/tabs/admin_tab.dm
@@ -97,7 +97,7 @@
if(body && !body.key)
body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
if(body.client)
- body.client.change_view(world_view_size) //reset view range to default.
+ body.client.change_view(GLOB.world_view_size) //reset view range to default.
//re-open STUI
if(new_STUI)
@@ -383,7 +383,7 @@
set name = "Admin Verbs - Show"
set category = "Admin"
- add_verb(src, admin_verbs_hideable)
+ add_verb(src, GLOB.admin_verbs_hideable)
remove_verb(src, /client/proc/enable_admin_verbs)
if(!(admin_holder.rights & R_DEBUG))
@@ -396,7 +396,7 @@
set name = "Admin Verbs - Hide"
set category = "Admin"
- remove_verb(src, admin_verbs_hideable)
+ remove_verb(src, GLOB.admin_verbs_hideable)
add_verb(src, /client/proc/enable_admin_verbs)
/client/proc/strip_all_in_view()
@@ -657,13 +657,13 @@
/proc/set_lz_resin_allowed(allowed = TRUE)
if(allowed)
- for(var/area/A in all_areas)
+ for(var/area/A in GLOB.all_areas)
if(A.flags_area & AREA_UNWEEDABLE)
continue
A.is_resin_allowed = TRUE
msg_admin_niche("Areas close to landing zones are now weedable.")
else
- for(var/area/A in all_areas)
+ for(var/area/A in GLOB.all_areas)
if(A.flags_area & AREA_UNWEEDABLE)
continue
A.is_resin_allowed = initial(A.is_resin_allowed)
diff --git a/code/modules/admin/tabs/debug_tab.dm b/code/modules/admin/tabs/debug_tab.dm
index d8187abe3714..df11917f087a 100644
--- a/code/modules/admin/tabs/debug_tab.dm
+++ b/code/modules/admin/tabs/debug_tab.dm
@@ -5,7 +5,7 @@
if(!check_rights(R_DEBUG))
return
- add_verb(src, debug_verbs)
+ add_verb(src, GLOB.debug_verbs)
remove_verb(src, /client/proc/enable_debug_verbs)
/client/proc/hide_debug_verbs()
@@ -15,7 +15,7 @@
if(!check_rights(R_DEBUG))
return
- remove_verb(src, debug_verbs)
+ remove_verb(src, GLOB.debug_verbs)
add_verb(src, /client/proc/enable_debug_verbs)
/client/proc/enter_tree()
@@ -81,8 +81,8 @@
set name = "Reset Intel Data Tab"
if(tgui_alert(src, "Clear the data tab?", "Confirm", list("Yes", "No"), 10 SECONDS) == "Yes")
- for(var/datum/cm_objective/Objective in intel_system.oms.disks)
- intel_system.oms.disks -= Objective
+ for(var/datum/cm_objective/Objective in GLOB.intel_system.oms.disks)
+ GLOB.intel_system.oms.disks -= Objective
/client/proc/check_round_statistics()
set category = "Debug"
@@ -90,7 +90,7 @@
if(!check_rights(R_ADMIN|R_DEBUG))
return
- debug_variables(round_statistics)
+ debug_variables(GLOB.round_statistics)
/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in world)
set category = "Debug"
@@ -165,10 +165,10 @@
set name = "Reload Whitelist"
set category = "Debug"
if(alert("Are you sure you want to do this?",, "Yes", "No") != "Yes") return
- if(!check_rights(R_SERVER) || !RoleAuthority) return
+ if(!check_rights(R_SERVER) || !GLOB.RoleAuthority) return
message_admins("[usr.ckey] manually reloaded the role whitelist.")
- RoleAuthority.load_whitelist()
+ GLOB.RoleAuthority.load_whitelist()
/client/proc/bulk_fetcher()
set name = "Bulk Fetch Items"
diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm
index fcc604c9cfa8..7a6359ccf090 100644
--- a/code/modules/admin/tabs/event_tab.dm
+++ b/code/modules/admin/tabs/event_tab.dm
@@ -275,12 +275,12 @@
var/points_to_add = tgui_input_real_number(usr, "Enter the amount of points to give, or a negative number to subtract. 1 point = $100.", "Points", 0)
if(!points_to_add)
return
- else if((supply_controller.points + points_to_add) < 0)
- supply_controller.points = 0
- else if((supply_controller.points + points_to_add) > 99999)
- supply_controller.points = 99999
+ else if((GLOB.supply_controller.points + points_to_add) < 0)
+ GLOB.supply_controller.points = 0
+ else if((GLOB.supply_controller.points + points_to_add) > 99999)
+ GLOB.supply_controller.points = 99999
else
- supply_controller.points += points_to_add
+ GLOB.supply_controller.points += points_to_add
message_admins("[key_name_admin(usr)] granted requisitions [points_to_add] points.")
@@ -294,11 +294,11 @@
if(!SSticker.mode || !check_rights(R_ADMIN))
return
- var/req_heat_change = tgui_input_real_number(usr, "Set the new requisitions black market heat. ERT is called at 100, disabled at -1. Current Heat: [supply_controller.black_market_heat]", "Modify Req Heat", 0, 100, -1)
+ var/req_heat_change = tgui_input_real_number(usr, "Set the new requisitions black market heat. ERT is called at 100, disabled at -1. Current Heat: [GLOB.supply_controller.black_market_heat]", "Modify Req Heat", 0, 100, -1)
if(!req_heat_change)
return
- supply_controller.black_market_heat = req_heat_change
+ GLOB.supply_controller.black_market_heat = req_heat_change
message_admins("[key_name_admin(usr)] set requisitions heat to [req_heat_change].")
@@ -433,12 +433,12 @@
return
var/datum/supply_order/new_order = new()
- new_order.ordernum = supply_controller.ordernum
- supply_controller.ordernum++
- new_order.object = supply_controller.supply_packs[nuketype]
+ new_order.ordernum = GLOB.supply_controller.ordernum
+ GLOB.supply_controller.ordernum++
+ new_order.object = GLOB.supply_controller.supply_packs[nuketype]
new_order.orderedby = MAIN_AI_SYSTEM
new_order.approvedby = MAIN_AI_SYSTEM
- supply_controller.shoppinglist += new_order
+ GLOB.supply_controller.shoppinglist += new_order
marine_announcement("A nuclear device has been supplied and will be delivered to requisitions via ASRS.", "NUCLEAR ARSENAL ACQUIRED", 'sound/misc/notice2.ogg')
message_admins("[key_name_admin(usr)] admin-spawned a [encrypt] nuke.")
@@ -507,7 +507,7 @@
if(!customname)
customname = "[faction] Update"
if(faction == FACTION_MARINE)
- for(var/obj/structure/machinery/computer/almayer_control/C in machines)
+ for(var/obj/structure/machinery/computer/almayer_control/C in GLOB.machines)
if(!(C.inoperable()))
var/obj/item/paper/P = new /obj/item/paper( C.loc )
P.name = "'[customname].'"
@@ -678,14 +678,14 @@
set name = "Mob Event Verbs - Show"
set category = "Admin.Events"
- add_verb(src, admin_mob_event_verbs_hideable)
+ add_verb(src, GLOB.admin_mob_event_verbs_hideable)
remove_verb(src, /client/proc/enable_event_mob_verbs)
/client/proc/hide_event_mob_verbs()
set name = "Mob Event Verbs - Hide"
set category = "Admin.Events"
- remove_verb(src, admin_mob_event_verbs_hideable)
+ remove_verb(src, GLOB.admin_mob_event_verbs_hideable)
add_verb(src, /client/proc/enable_event_mob_verbs)
// ----------------------------
diff --git a/code/modules/admin/tabs/round_tab.dm b/code/modules/admin/tabs/round_tab.dm
index 22ba96a2317a..39a9050053f1 100644
--- a/code/modules/admin/tabs/round_tab.dm
+++ b/code/modules/admin/tabs/round_tab.dm
@@ -38,9 +38,9 @@
return
if(!(predator_round.flags_round_type & MODE_PREDATOR))
- var/datum/job/PJ = RoleAuthority.roles_for_mode[JOB_PREDATOR]
+ var/datum/job/PJ = GLOB.RoleAuthority.roles_for_mode[JOB_PREDATOR]
if(istype(PJ) && !PJ.spawn_positions)
- PJ.set_spawn_positions(players_preassigned)
+ PJ.set_spawn_positions(GLOB.players_preassigned)
predator_round.flags_round_type |= MODE_PREDATOR
else
predator_round.flags_round_type &= ~MODE_PREDATOR
@@ -58,8 +58,8 @@
var/roles[] = new
var/i
var/datum/job/J
- for(i in RoleAuthority.roles_for_mode) //All the roles in the game.
- J = RoleAuthority.roles_for_mode[i]
+ for(i in GLOB.RoleAuthority.roles_for_mode) //All the roles in the game.
+ J = GLOB.RoleAuthority.roles_for_mode[i]
if(J.total_positions > 0 && J.current_positions > 0)
roles += i
@@ -67,7 +67,7 @@
var/role = input("This list contains all roles that have at least one slot taken.\nPlease select role slot to free.", "Free role slot") as null|anything in roles
if(!role)
return
- RoleAuthority.free_role_admin(RoleAuthority.roles_for_mode[role], TRUE, src)
+ GLOB.RoleAuthority.free_role_admin(GLOB.RoleAuthority.roles_for_mode[role], TRUE, src)
/client/proc/modify_slot()
set name = "Adjust Job Slots"
@@ -81,10 +81,10 @@
var/active_role_names = GLOB.gamemode_roles[GLOB.master_mode]
if(!active_role_names)
- active_role_names = ROLES_DISTRESS_SIGNAL
+ active_role_names = GLOB.ROLES_DISTRESS_SIGNAL
for(var/role_name as anything in active_role_names)
- var/datum/job/job = RoleAuthority.roles_by_name[role_name]
+ var/datum/job/job = GLOB.RoleAuthority.roles_by_name[role_name]
if(!job)
continue
roles += role_name
@@ -92,12 +92,12 @@
var/role = input("Please select role slot to modify", "Modify amount of slots") as null|anything in roles
if(!role)
return
- J = RoleAuthority.roles_by_name[role]
+ J = GLOB.RoleAuthority.roles_by_name[role]
var/tpos = J.spawn_positions
var/num = tgui_input_number(src, "How many slots role [J.title] should have?\nCurrently taken slots: [J.current_positions]\nTotal amount of slots opened this round: [J.total_positions_so_far]","Number:", tpos)
if(isnull(num))
return
- if(!RoleAuthority.modify_role(J, num))
+ if(!GLOB.RoleAuthority.modify_role(J, num))
to_chat(usr, SPAN_BOLDNOTICE("Can't set job slots to be less than amount of log-ins or you are setting amount of slots less than minimal. Free slots first."))
message_admins("[key_name(usr)] adjusted job slots of [J.title] to be [num].")
diff --git a/code/modules/admin/tabs/server_tab.dm b/code/modules/admin/tabs/server_tab.dm
index 84c9426dfa3f..382b08c182b5 100644
--- a/code/modules/admin/tabs/server_tab.dm
+++ b/code/modules/admin/tabs/server_tab.dm
@@ -21,8 +21,8 @@
set desc = "Players can still log into the server, but players won't be able to join the game as a new mob."
set category = "Server"
- enter_allowed = !enter_allowed
- if(!enter_allowed)
+ GLOB.enter_allowed = !GLOB.enter_allowed
+ if(!GLOB.enter_allowed)
to_world("
New players may no longer join the game.")
else
to_world("
New players may now join the game.")
@@ -34,8 +34,8 @@
set desc = "Globally Toggles Deadchat"
set category = "Server"
- dsay_allowed = !dsay_allowed
- if(dsay_allowed)
+ GLOB.dsay_allowed = !GLOB.dsay_allowed
+ if(GLOB.dsay_allowed)
to_world("
Deadchat has been globally enabled!")
else
to_world("
Deadchat has been globally disabled!")
@@ -46,8 +46,8 @@
set desc = "Globally Toggles OOC"
set category = "Server"
- ooc_allowed = !ooc_allowed
- if(ooc_allowed)
+ GLOB.ooc_allowed = !GLOB.ooc_allowed
+ if(GLOB.ooc_allowed)
to_world("
The OOC channel has been globally enabled!")
else
to_world("
The OOC channel has been globally disabled!")
@@ -58,8 +58,8 @@
set desc = "Globally Toggles LOOC"
set category = "Server"
- looc_allowed = !looc_allowed
- if(looc_allowed)
+ GLOB.looc_allowed = !GLOB.looc_allowed
+ if(GLOB.looc_allowed)
to_world("
The LOOC channel has been globally enabled!")
else
to_world("
The LOOC channel has been globally disabled!")
diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm
index d60377123c49..40c6d273b267 100644
--- a/code/modules/admin/topic/topic.dm
+++ b/code/modules/admin/topic/topic.dm
@@ -50,7 +50,7 @@
if(task == "add")
var/new_ckey = ckey(input(usr,"New admin's ckey","Admin ckey", null) as text|null)
if(!new_ckey) return
- if(new_ckey in admin_datums)
+ if(new_ckey in GLOB.admin_datums)
to_chat(usr, "
Error: Topic 'editrights': [new_ckey] is already an admin")
return
adm_ckey = new_ckey
@@ -61,20 +61,20 @@
to_chat(usr, "
Error: Topic 'editrights': No valid ckey")
return
- var/datum/admins/D = admin_datums[adm_ckey]
+ var/datum/admins/D = GLOB.admin_datums[adm_ckey]
if(task == "remove")
if(alert("Are you sure you want to remove [adm_ckey]?","Message","Yes","Cancel") == "Yes")
if(!D) return
- admin_datums -= adm_ckey
+ GLOB.admin_datums -= adm_ckey
D.disassociate()
message_admins("[key_name_admin(usr)] removed [adm_ckey] from the admins list")
else if(task == "rank")
var/new_rank
- if(admin_ranks.len)
- new_rank = tgui_input_list(usr, "Please select a rank", "New rank", (admin_ranks|"*New Rank*"))
+ if(GLOB.admin_ranks.len)
+ new_rank = tgui_input_list(usr, "Please select a rank", "New rank", (GLOB.admin_ranks|"*New Rank*"))
else
new_rank = tgui_input_list(usr, "Please select a rank", "New rank", list("Game Master","Game Admin", "Trial Admin", "Admin Observer","*New Rank*"))
@@ -91,15 +91,15 @@
to_chat(usr, "
Error: Topic 'editrights': Invalid rank")
return
if(CONFIG_GET(flag/admin_legacy_system))
- if(admin_ranks.len)
- if(new_rank in admin_ranks)
- rights = admin_ranks[new_rank] //we typed a rank which already exists, use its rights
+ if(GLOB.admin_ranks.len)
+ if(new_rank in GLOB.admin_ranks)
+ rights = GLOB.admin_ranks[new_rank] //we typed a rank which already exists, use its rights
else
- admin_ranks[new_rank] = 0 //add the new rank to admin_ranks
+ GLOB.admin_ranks[new_rank] = 0 //add the new rank to admin_ranks
else
if(CONFIG_GET(flag/admin_legacy_system))
new_rank = ckeyEx(new_rank)
- rights = admin_ranks[new_rank] //we input an existing rank, use its rights
+ rights = GLOB.admin_ranks[new_rank] //we input an existing rank, use its rights
if(D)
D.disassociate() //remove adminverbs and unlink from client
@@ -238,31 +238,31 @@
var/reason
var/banfolder = href_list["unbanupgradeperma"]
- Banlist.cd = "/base/[banfolder]"
- var/reason2 = Banlist["reason"]
+ GLOB.Banlist.cd = "/base/[banfolder]"
+ var/reason2 = GLOB.Banlist["reason"]
- var/minutes = Banlist["minutes"]
+ var/minutes = GLOB.Banlist["minutes"]
- var/banned_key = Banlist["key"]
- Banlist.cd = "/base"
+ var/banned_key = GLOB.Banlist["key"]
+ GLOB.Banlist.cd = "/base"
var/mins = 0
- if(minutes > CMinutes)
- mins = minutes - CMinutes
+ if(minutes > GLOB.CMinutes)
+ mins = minutes - GLOB.CMinutes
if(!mins) return
mins = max(5255990,mins) // 10 years
- minutes = CMinutes + mins
+ minutes = GLOB.CMinutes + mins
reason = input(usr,"Reason?","reason",reason2) as message|null
if(!reason) return
ban_unban_log_save("[key_name(usr)] upgraded [banned_key]'s ban to a permaban. Reason: [sanitize(reason)]")
message_admins("[key_name_admin(usr)] upgraded [banned_key]'s ban to a permaban. Reason: [sanitize(reason)]")
- Banlist.cd = "/base/[banfolder]"
- Banlist["reason"] << sanitize(reason)
- Banlist["temp"] << 0
- Banlist["minutes"] << minutes
- Banlist["bannedby"] << usr.ckey
- Banlist.cd = "/base"
+ GLOB.Banlist.cd = "/base/[banfolder]"
+ GLOB.Banlist["reason"] << sanitize(reason)
+ GLOB.Banlist["temp"] << 0
+ GLOB.Banlist["minutes"] << minutes
+ GLOB.Banlist["bannedby"] << usr.ckey
+ GLOB.Banlist.cd = "/base"
unbanpanel()
else if(href_list["unbane"])
@@ -272,36 +272,36 @@
var/reason
var/banfolder = href_list["unbane"]
- Banlist.cd = "/base/[banfolder]"
- var/reason2 = Banlist["reason"]
- var/temp = Banlist["temp"]
+ GLOB.Banlist.cd = "/base/[banfolder]"
+ var/reason2 = GLOB.Banlist["reason"]
+ var/temp = GLOB.Banlist["temp"]
- var/minutes = Banlist["minutes"]
+ var/minutes = GLOB.Banlist["minutes"]
- var/banned_key = Banlist["key"]
- Banlist.cd = "/base"
+ var/banned_key = GLOB.Banlist["key"]
+ GLOB.Banlist.cd = "/base"
var/duration
var/mins = 0
- if(minutes > CMinutes)
- mins = minutes - CMinutes
+ if(minutes > GLOB.CMinutes)
+ mins = minutes - GLOB.CMinutes
mins = tgui_input_number(usr,"How long (in minutes)? \n 1440 = 1 day \n 4320 = 3 days \n 10080 = 7 days \n 43800 = 1 Month","Ban time", 1440, 262800, 1)
if(!mins) return
mins = min(525599,mins)
- minutes = CMinutes + mins
+ minutes = GLOB.CMinutes + mins
duration = GetExp(minutes)
reason = input(usr,"Reason?","reason",reason2) as message|null
if(!reason) return
ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [sanitize(reason)] Duration: [duration]")
message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [sanitize(reason)] Duration: [duration]")
- Banlist.cd = "/base/[banfolder]"
- Banlist["reason"] << sanitize(reason)
- Banlist["temp"] << temp
- Banlist["minutes"] << minutes
- Banlist["bannedby"] << usr.ckey
- Banlist.cd = "/base"
+ GLOB.Banlist.cd = "/base/[banfolder]"
+ GLOB.Banlist["reason"] << sanitize(reason)
+ GLOB.Banlist["temp"] << temp
+ GLOB.Banlist["minutes"] << minutes
+ GLOB.Banlist["bannedby"] << usr.ckey
+ GLOB.Banlist.cd = "/base"
unbanpanel()
/////////////////////////////////////new ban stuff
@@ -320,7 +320,7 @@
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
- if(!RoleAuthority)
+ if(!GLOB.RoleAuthority)
to_chat(usr, "Role Authority has not been set up!")
return
@@ -333,23 +333,23 @@
var/list/joblist = list()
switch(href_list["jobban3"])
if("CICdept")
- joblist += get_job_titles_from_list(ROLES_COMMAND)
+ joblist += get_job_titles_from_list(GLOB.ROLES_COMMAND)
if("Supportdept")
- joblist += get_job_titles_from_list(ROLES_AUXIL_SUPPORT)
+ joblist += get_job_titles_from_list(GLOB.ROLES_AUXIL_SUPPORT)
if("Policedept")
- joblist += get_job_titles_from_list(ROLES_POLICE)
+ joblist += get_job_titles_from_list(GLOB.ROLES_POLICE)
if("Engineeringdept")
- joblist += get_job_titles_from_list(ROLES_ENGINEERING)
+ joblist += get_job_titles_from_list(GLOB.ROLES_ENGINEERING)
if("Requisitiondept")
- joblist += get_job_titles_from_list(ROLES_REQUISITION)
+ joblist += get_job_titles_from_list(GLOB.ROLES_REQUISITION)
if("Medicaldept")
- joblist += get_job_titles_from_list(ROLES_MEDICAL)
+ joblist += get_job_titles_from_list(GLOB.ROLES_MEDICAL)
if("Marinesdept")
- joblist += get_job_titles_from_list(ROLES_MARINES)
+ joblist += get_job_titles_from_list(GLOB.ROLES_MARINES)
if("Miscdept")
- joblist += get_job_titles_from_list(ROLES_MISC)
+ joblist += get_job_titles_from_list(GLOB.ROLES_MISC)
if("Xenosdept")
- joblist += get_job_titles_from_list(ROLES_XENO)
+ joblist += get_job_titles_from_list(GLOB.ROLES_XENO)
else
joblist += href_list["jobban3"]
@@ -562,7 +562,7 @@
var/dat = {"
What mode do you wish to play?
"}
for(var/mode in config.modes)
dat += {"
[config.mode_names[mode]]"}
- dat += {"Now: [master_mode]"}
+ dat += {"Now: [GLOB.master_mode]"}
show_browser(usr, dat, "Change Gamemode", "c_mode")
else if(href_list["f_secret"])
@@ -570,13 +570,13 @@
if(SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
- if(master_mode != "secret")
+ if(GLOB.master_mode != "secret")
return alert(usr, "The game mode has to be secret!", null, null, null, null)
var/dat = {"
What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"}
for(var/mode in config.modes)
dat += {"
[config.mode_names[mode]]"}
dat += {"
Random (default)"}
- dat += {"Now: [secret_force_mode]"}
+ dat += {"Now: [GLOB.secret_force_mode]"}
show_browser(usr, dat, "Change Secret Gamemode", "f_secret")
else if(href_list["c_mode2"])
@@ -594,10 +594,10 @@
if(SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
- if(master_mode != "secret")
+ if(GLOB.master_mode != "secret")
return alert(usr, "The game mode has to be secret!", null, null, null, null)
- secret_force_mode = href_list["f_secret2"]
- message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].")
+ GLOB.secret_force_mode = href_list["f_secret2"]
+ message_admins("[key_name_admin(usr)] set the forced secret mode as [GLOB.secret_force_mode].")
Game() // updates the main game menu
.(href, list("f_secret"=1))
@@ -949,7 +949,7 @@
H.mind.transfer_to(M)
else
M.key = H.key
- if(M.client) M.client.change_view(world_view_size)
+ if(M.client) M.client.change_view(GLOB.world_view_size)
if(M.skills)
qdel(M.skills)
@@ -1044,7 +1044,7 @@
return
if(alert("Are you sure you want to cancel this OB?",,"Yes","No") != "Yes")
return
- orbital_cannon_cancellation["[cancel_token]"] = null
+ GLOB.orbital_cannon_cancellation["[cancel_token]"] = null
message_admins("[src.owner] has cancelled the orbital strike.")
else if(href_list["admincancelpredsd"])
@@ -1208,7 +1208,7 @@
msg_ghost += "
view message"
announce_fax(msg_ghost = msg_ghost)
- for(var/obj/structure/machinery/faxmachine/F in machines)
+ for(var/obj/structure/machinery/faxmachine/F in GLOB.machines)
if(F == fax)
if(!(F.inoperable()))
@@ -1290,7 +1290,7 @@
msg_ghost += "
view message"
announce_fax( ,msg_ghost)
- for(var/obj/structure/machinery/faxmachine/F in machines)
+ for(var/obj/structure/machinery/faxmachine/F in GLOB.machines)
if(F == fax)
if(!(F.inoperable()))
@@ -1372,7 +1372,7 @@
announce_fax( ,msg_ghost)
- for(var/obj/structure/machinery/faxmachine/F in machines)
+ for(var/obj/structure/machinery/faxmachine/F in GLOB.machines)
if(F == fax)
if(!(F.inoperable()))
@@ -1454,7 +1454,7 @@
announce_fax( ,msg_ghost)
- for(var/obj/structure/machinery/faxmachine/F in machines)
+ for(var/obj/structure/machinery/faxmachine/F in GLOB.machines)
if(F == fax)
if(!(F.inoperable()))
@@ -1778,16 +1778,16 @@
//unanswered_distress -= ref_person
if(href_list["distresscancel"])
- if(distress_cancel)
+ if(GLOB.distress_cancel)
to_chat(usr, "The distress beacon was either canceled, or you are too late to cancel.")
return
log_game("[key_name_admin(usr)] has canceled the distress beacon.")
message_admins("[key_name_admin(usr)] has canceled the distress beacon.")
- distress_cancel = TRUE
+ GLOB.distress_cancel = TRUE
return
if(href_list["distress"]) //Distress Beacon, sends a random distress beacon when pressed
- distress_cancel = FALSE
+ GLOB.distress_cancel = FALSE
message_admins("[key_name_admin(usr)] has opted to SEND the distress beacon! Launching in 10 seconds... (
CANCEL)")
addtimer(CALLBACK(src, PROC_REF(accept_ert), usr, locate(href_list["distress"])), 10 SECONDS)
//unanswered_distress -= ref_person
@@ -1795,7 +1795,7 @@
if(href_list["distress_handheld"]) //Prepares to call and logs accepted handheld distress beacons
var/mob/ref_person = href_list["distress_handheld"]
var/ert_name = href_list["ert_name"]
- distress_cancel = FALSE
+ GLOB.distress_cancel = FALSE
message_admins("[key_name_admin(usr)] has opted to SEND [ert_name]! Launching in 10 seconds... (
CANCEL)")
addtimer(CALLBACK(src, PROC_REF(accept_handheld_ert), usr, ref_person, ert_name), 10 SECONDS)
@@ -1806,10 +1806,10 @@
message_admins("[key_name_admin(usr)] has denied a distress beacon, requested by [key_name_admin(ref_person)]")
if(href_list["destroyship"]) //Distress Beacon, sends a random distress beacon when pressed
- destroy_cancel = FALSE
+ GLOB.destroy_cancel = FALSE
message_admins("[key_name_admin(usr)] has opted to GRANT the self-destruct! Starting in 10 seconds... (
CANCEL)")
spawn(100)
- if(distress_cancel)
+ if(GLOB.distress_cancel)
return
var/mob/ref_person = locate(href_list["destroyship"])
set_security_level(SEC_LEVEL_DELTA)
@@ -1830,12 +1830,12 @@
//make ASRS order for nuke
var/datum/supply_order/new_order = new()
- new_order.ordernum = supply_controller.ordernum
- supply_controller.ordernum++
- new_order.object = supply_controller.supply_packs[nuketype]
+ new_order.ordernum = GLOB.supply_controller.ordernum
+ GLOB.supply_controller.ordernum++
+ new_order.object = GLOB.supply_controller.supply_packs[nuketype]
new_order.orderedby = ref_person
new_order.approvedby = "USCM High Command"
- supply_controller.shoppinglist += new_order
+ GLOB.supply_controller.shoppinglist += new_order
//Can no longer request a nuke
GLOB.ares_datacore.nuke_available = FALSE
@@ -1859,7 +1859,7 @@
message_admins("[key_name_admin(usr)] has denied self-destruct, requested by [key_name_admin(ref_person)]", 1)
if(href_list["sdcancel"])
- if(destroy_cancel)
+ if(GLOB.destroy_cancel)
to_chat(usr, "The self-destruct was already canceled.")
return
if(get_security_level() == "delta")
@@ -1867,7 +1867,7 @@
return
log_game("[key_name_admin(usr)] has canceled the self-destruct.")
message_admins("[key_name_admin(usr)] has canceled the self-destruct.")
- destroy_cancel = 1
+ GLOB.destroy_cancel = TRUE
return
if(href_list["tag_datum"])
@@ -1975,18 +1975,18 @@
return
/datum/admins/proc/accept_ert(mob/approver, mob/ref_person)
- if(distress_cancel)
+ if(GLOB.distress_cancel)
return
- distress_cancel = TRUE
+ GLOB.distress_cancel = TRUE
SSticker.mode.activate_distress()
log_game("[key_name_admin(approver)] has sent a randomized distress beacon, requested by [key_name_admin(ref_person)]")
message_admins("[key_name_admin(approver)] has sent a randomized distress beacon, requested by [key_name_admin(ref_person)]")
///Handles calling the ERT sent by handheld distress beacons
/datum/admins/proc/accept_handheld_ert(mob/approver, mob/ref_person, ert_called)
- if(distress_cancel)
+ if(GLOB.distress_cancel)
return
- distress_cancel = TRUE
+ GLOB.distress_cancel = TRUE
SSticker.mode.get_specific_call("[ert_called]", TRUE, FALSE)
log_game("[key_name_admin(approver)] has sent [ert_called], requested by [key_name_admin(ref_person)]")
message_admins("[key_name_admin(approver)] has sent [ert_called], requested by [key_name_admin(ref_person)]")
@@ -2000,7 +2000,7 @@
for(var/jobPos in roles)
if(!jobPos)
continue
- var/datum/job/job = RoleAuthority.roles_by_name[jobPos]
+ var/datum/job/job = GLOB.RoleAuthority.roles_by_name[jobPos]
if(!job)
continue
@@ -2022,7 +2022,7 @@
for(var/jobPos in roles)
if(!jobPos)
continue
- var/datum/job/J = RoleAuthority.roles_by_name[jobPos]
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[jobPos]
if(!J)
continue
temp += J.title
diff --git a/code/modules/admin/topic/topic_chems.dm b/code/modules/admin/topic/topic_chems.dm
index fe8af3b77d96..77e1c0c6d1b8 100644
--- a/code/modules/admin/topic/topic_chems.dm
+++ b/code/modules/admin/topic/topic_chems.dm
@@ -39,14 +39,14 @@
var/response = alert(usr,"Enter ID or select ID from list?",null, "Enter ID","Select from list")
var/target
if(response == "Select from list")
- var/list/pool = chemical_reagents_list
+ var/list/pool = GLOB.chemical_reagents_list
pool = sortAssoc(pool)
target = tgui_input_list(usr,"Select the ID of the chemical reagent you wish to view:", "View reagent", pool)
else if(response == "Enter ID")
target = input(usr,"Enter the ID of the chemical reagent you wish to view:")
if(!target)
return
- var/datum/reagent/R = chemical_reagents_list[target]
+ var/datum/reagent/R = GLOB.chemical_reagents_list[target]
if(R)
usr.client.debug_variables(R)
else
@@ -56,7 +56,7 @@
var/target = input(usr,"Enter the ID of the chemical reaction you wish to view:")
if(!target)
return
- var/datum/chemical_reaction/R = chemical_reactions_list[target]
+ var/datum/chemical_reaction/R = GLOB.chemical_reactions_list[target]
if(R)
usr.client.debug_variables(R)
log_admin("[key_name(usr)] is viewing the chemical reaction for [R].")
@@ -67,7 +67,7 @@
var/target = input(usr,"Enter the ID of the chemical reaction you wish to syncronize. This is only necessary if you edited a reaction through the debugger (VV).")
if(!target)
return
- var/datum/chemical_reaction/R = chemical_reactions_list[target]
+ var/datum/chemical_reaction/R = GLOB.chemical_reactions_list[target]
if(R)
R.add_to_filtered_list(TRUE)
log_debug("[key_name(usr)] resyncronized [R.id]")
@@ -77,7 +77,7 @@
return
if("spawn_reagent")
var/target = input(usr,"Enter the ID of the chemical reagent you wish to make:")
- if(!chemical_reagents_list[target])
+ if(!GLOB.chemical_reagents_list[target])
to_chat(usr,SPAN_WARNING("No reagent with this ID could been found."))
return
var/volume = tgui_input_number(usr,"How much? An appropriate container will be selected.")
@@ -88,18 +88,18 @@
return
if("make_report")
var/target = input(usr, "Enter the ID of the chemical reagent you wish to make a report of:")
- if(!chemical_reagents_list[target])
+ if(!GLOB.chemical_reagents_list[target])
to_chat(usr, SPAN_WARNING("No reagent with this ID could be found."))
return
- var/datum/reagent/R = chemical_reagents_list[target]
+ var/datum/reagent/R = GLOB.chemical_reagents_list[target]
R.print_report(loc = usr.loc, admin_spawned = TRUE)
//For quickly generating a new chemical
if("create_random_reagent")
var/target = input(usr,"Enter the ID of the chemical reagent you wish to make:")
if(!target)
return
- if(chemical_reagents_list[target])
+ if(GLOB.chemical_reagents_list[target])
to_chat(usr,SPAN_WARNING("This ID is already in use."))
return
var/tier = tgui_input_number(usr,"Enter the generation tier you wish. This will affect the number of properties (tier + 1), rarity of components and potential for good properties. Ought to be 1-4, max 10.", "Generation tier", 1, 10)
@@ -116,41 +116,41 @@
R.generate_name()
R.generate_stats()
//Save our reagent
- chemical_reagents_list[target] = R
+ GLOB.chemical_reagents_list[target] = R
message_admins("[key_name_admin(usr)] has generated the reagent: [target].")
var/response = alert(usr,"Do you want to do anything else?",null,"Generate associated reaction","View my reagent","Finish")
while(response != "Finish")
switch(response)
if("Generate associated reaction")
- if(chemical_reactions_list[target])
+ if(GLOB.chemical_reactions_list[target])
to_chat(usr,SPAN_WARNING("This ID is already in use."))
return
R.generate_assoc_recipe()
- if(!chemical_reactions_list[target])
+ if(!GLOB.chemical_reactions_list[target])
to_chat(usr,SPAN_WARNING("Something went wrong when saving the reaction. The associated reagent has been deleted."))
- chemical_reagents_list[target] -= R
+ GLOB.chemical_reagents_list[target] -= R
return
response = alert(usr,"Do you want to do anything else?",null,"View my reaction","View my reagent","Finish")
if("View my reagent")
- if(chemical_reagents_list[target])
- R = chemical_reagents_list[target]
+ if(GLOB.chemical_reagents_list[target])
+ R = GLOB.chemical_reagents_list[target]
usr.client.debug_variables(R)
log_admin("[key_name(usr)] is viewing the chemical reaction for [R].")
else
to_chat(usr,SPAN_WARNING("No reagent with this ID could been found. Wait what? But I just... Contact a debugger."))
- chemical_reagents_list.Remove(target)
- chemical_reactions_list.Remove("[target]")
- chemical_reactions_filtered_list.Remove("[target]")
+ GLOB.chemical_reagents_list.Remove(target)
+ GLOB.chemical_reactions_list.Remove("[target]")
+ GLOB.chemical_reactions_filtered_list.Remove("[target]")
return
if("View my reaction")
- if(chemical_reactions_list[target])
- var/datum/chemical_reaction/generated/G = chemical_reactions_list[target]
+ if(GLOB.chemical_reactions_list[target])
+ var/datum/chemical_reaction/generated/G = GLOB.chemical_reactions_list[target]
usr.client.debug_variables(G)
else
to_chat(usr,SPAN_WARNING("No reaction with this ID could been found. Wait what? But I just... Contact a debugger."))
- chemical_reagents_list.Remove(target)
- chemical_reactions_list.Remove("[target]")
- chemical_reactions_filtered_list.Remove("[target]")
+ GLOB.chemical_reagents_list.Remove(target)
+ GLOB.chemical_reactions_list.Remove("[target]")
+ GLOB.chemical_reactions_filtered_list.Remove("[target]")
return
else
break
@@ -165,7 +165,7 @@
var/target = input(usr,"Enter the ID of the chemical reagent you wish to make:")
if(!target)
return
- if(chemical_reagents_list[target])
+ if(GLOB.chemical_reagents_list[target])
to_chat(usr,SPAN_WARNING("This ID is already in use."))
return
var/datum/reagent/generated/R = new /datum/reagent/generated
@@ -190,7 +190,7 @@
response = alert(usr,"Select Input Type","Custom reagent [target]","Manual Input","Select","No more properties")
if("Manual Input")
var/input = input(usr,"Enter the name of the chemical property you wish to add:")
- var/datum/chem_property/P = chemical_properties_list[input]
+ var/datum/chem_property/P = GLOB.chemical_properties_list[input]
if(!P)
to_chat(usr,SPAN_WARNING("Property not found, did you spell it right?"))
response = "Specific property"
@@ -199,7 +199,7 @@
R.insert_property(P.name,level)
response = alert(usr,"Done. Add more?","Custom reagent [target]","Specific property","Specific number","No more properties")
if("Select")
- var/list/pool = chemical_properties_list
+ var/list/pool = GLOB.chemical_properties_list
pool = sortAssoc(pool)
var/P = tgui_input_list(usr,"Which property do you want?", "Property selection", pool)
var/level = tgui_input_number(usr,"Choose the level (this is a strength modifier, ought to be between 1-8)", "strengthmod", 1)
@@ -221,7 +221,7 @@
break
R.generate_description()
//Save our reagent
- chemical_reagents_list[target] = R
+ GLOB.chemical_reagents_list[target] = R
message_admins("[key_name_admin(usr)] has created a custom reagent: [target].")
//See what we want to do last
response = alert(usr,"Spawn container with reagent?","Custom reagent [target]","Yes","No, show me the reagent","No, I'm all done")
@@ -233,14 +233,14 @@
spawn_reagent(target, volume)
if("No, show me the reagent")
- usr.client.debug_variables(chemical_reagents_list[target])
+ usr.client.debug_variables(GLOB.chemical_reagents_list[target])
return
//For creating a custom reaction
if("create_custom_reaction")
var/target = input(usr,"Enter the ID of the chemical reaction you wish to make:")
if(!target)
return
- if(chemical_reactions_list[target])
+ if(GLOB.chemical_reactions_list[target])
to_chat(usr,SPAN_WARNING("This ID is already in use."))
return
var/datum/chemical_reaction/generated/R = new /datum/chemical_reaction/generated
@@ -262,7 +262,7 @@
if("Select type")
response = alert(usr,"Enter id manually or select from list?","Custom reaction [target]","Select from list","Manual input","Back")
if("Select from list")
- var/list/pool = chemical_reagents_list
+ var/list/pool = GLOB.chemical_reagents_list
pool = sortAssoc(pool)
component = tgui_input_list(usr,"Select:", "Create custom reaction", pool)
if(!component)
@@ -274,7 +274,7 @@
if(!component)
response = "Select type"
continue
- if(!chemical_reagents_list[component])
+ if(!GLOB.chemical_reagents_list[component])
to_chat(usr,SPAN_WARNING("ID not found. Try again."))
continue
response = "Add"
@@ -290,11 +290,11 @@
to_chat(usr,SPAN_WARNING("You need to add at least 3 components excluding catalysts. The reaction has not been saved."))
return
//Save our reaction
- chemical_reactions_list[target] = R
+ GLOB.chemical_reactions_list[target] = R
R.add_to_filtered_list()
- if(!chemical_reactions_list[target])
+ if(!GLOB.chemical_reactions_list[target])
to_chat(usr,SPAN_WARNING("Something went wrong when saving the reaction."))
return
- usr.client.debug_variables(chemical_reactions_list[target])
+ usr.client.debug_variables(GLOB.chemical_reactions_list[target])
message_admins("[key_name_admin(usr)] has created a custom chemical reaction: [target].")
return
diff --git a/code/modules/admin/topic/topic_events.dm b/code/modules/admin/topic/topic_events.dm
index c38f715d93bf..5e59ba4835f5 100644
--- a/code/modules/admin/topic/topic_events.dm
+++ b/code/modules/admin/topic/topic_events.dm
@@ -52,7 +52,7 @@
if("whiteout")
if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes")
return
- for(var/obj/structure/machinery/light/L in machines)
+ for(var/obj/structure/machinery/light/L in GLOB.machines)
L.fix()
message_admins("[key_name_admin(usr)] fixed all lights")
if("power")
@@ -82,16 +82,16 @@
power_restore_ship_reactors()
if("change_clearance")
var/list/clearance_levels = list(0,1,2,3,4,5)
- var/level = tgui_input_list(usr, "Select new clearance level:","Current level: [chemical_data.clearance_level]", clearance_levels)
+ var/level = tgui_input_list(usr, "Select new clearance level:","Current level: [GLOB.chemical_data.clearance_level]", clearance_levels)
if(!level)
return
message_admins("[key_name_admin(usr)] changed research clearance level to [level].")
- chemical_data.clearance_level = level
+ GLOB.chemical_data.clearance_level = level
if("give_research_credits")
var/amount = tgui_input_real_number(usr, "How many credits to add?")
if(amount != 0) //can add negative numbers too!
message_admins("[key_name_admin(usr)] added [amount] research credits.")
- chemical_data.update_credits(amount)
+ GLOB.chemical_data.update_credits(amount)
/datum/admins/proc/create_humans_list(href_list)
if(SSticker?.current_state < GAME_STATE_PLAYING)
@@ -272,7 +272,7 @@
if(!length(turfs))
return
- var/caste_type = RoleAuthority.get_caste_by_text(xeno_caste)
+ var/caste_type = GLOB.RoleAuthority.get_caste_by_text(xeno_caste)
var/list/xenos = list()
var/mob/living/carbon/xenomorph/X
diff --git a/code/modules/admin/topic/topic_teleports.dm b/code/modules/admin/topic/topic_teleports.dm
index 38eefdb49257..8a5360169999 100644
--- a/code/modules/admin/topic/topic_teleports.dm
+++ b/code/modules/admin/topic/topic_teleports.dm
@@ -8,7 +8,7 @@
owner.jump_to_area(choice)
if("jump_to_turf")
- var/turf/choice = tgui_input_list(owner, "Pick a turf to jump to:", "Jump", turfs)
+ var/turf/choice = tgui_input_list(owner, "Pick a turf to jump to:", "Jump", GLOB.turfs)
if(QDELETED(choice))
return
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index cef0625c0adf..5cccdcfaa838 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -23,7 +23,7 @@
message_admins(WRAP_STAFF_LOG(usr, "jumped to area [get_area(usr)] ([usr.loc.x],[usr.loc.y],[usr.loc.z])."), usr.loc.x, usr.loc.y, usr.loc.z)
-/client/proc/jump_to_turf(turf/T in turfs)
+/client/proc/jump_to_turf(turf/T in GLOB.turfs)
set name = "Jump to Turf"
set category = null
diff --git a/code/modules/admin/verbs/adminpanelgq.dm b/code/modules/admin/verbs/adminpanelgq.dm
index 8ef1ed869661..82efd0906873 100644
--- a/code/modules/admin/verbs/adminpanelgq.dm
+++ b/code/modules/admin/verbs/adminpanelgq.dm
@@ -2,7 +2,7 @@
set name = "Call General Quarters"
set category = "Admin.Ship"
- if(security_level == SEC_LEVEL_RED || security_level == SEC_LEVEL_DELTA)
+ if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA)
tgui_alert(src, "Security is already red or above, General Quarters cannot be called.", "Acknowledge!", list("ok."), 10 SECONDS)
return FALSE
diff --git a/code/modules/admin/verbs/autoreplace.dm b/code/modules/admin/verbs/autoreplace.dm
index dc6ebb09db2c..b2fe04cfb4a3 100644
--- a/code/modules/admin/verbs/autoreplace.dm
+++ b/code/modules/admin/verbs/autoreplace.dm
@@ -1,4 +1,4 @@
-var/list/datum/decorator/manual/admin_runtime/admin_runtime_decorators = list()
+GLOBAL_LIST_INIT_TYPED(admin_runtime_decorators, /datum/decorator/manual/admin_runtime, list())
/client/proc/set_autoreplacer()
set category = "Admin.Events"
@@ -30,9 +30,9 @@ var/list/datum/decorator/manual/admin_runtime/admin_runtime_decorators = list()
if("No")
return
- admin_runtime_decorators.Add(SSdecorator.add_decorator(/datum/decorator/manual/admin_runtime, types, subtypes, field, value))
+ GLOB.admin_runtime_decorators.Add(SSdecorator.add_decorator(/datum/decorator/manual/admin_runtime, types, subtypes, field, value))
- log_and_message_admins("[src] activated new decorator id: [admin_runtime_decorators.len] set for [hint_text] `[types]` for field `[field]` set value `[value]`")
+ log_and_message_admins("[src] activated new decorator id: [GLOB.admin_runtime_decorators.len] set for [hint_text] `[types]` for field `[field]` set value `[value]`")
/client/proc/deactivate_autoreplacer()
set category = "Admin.Events"
@@ -47,7 +47,7 @@ var/list/datum/decorator/manual/admin_runtime/admin_runtime_decorators = list()
if(!num_value)
return
- admin_runtime_decorators[num_value].enabled = FALSE
+ GLOB.admin_runtime_decorators[num_value].enabled = FALSE
log_and_message_admins("[src] deactivated decorator id: [num_value]")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index a7ee69469f1d..c776a12eb330 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -86,8 +86,8 @@
if(!SSticker.mode)
to_chat(usr, "Mode not found?")
- round_should_check_for_win = !round_should_check_for_win
- if (round_should_check_for_win)
+ GLOB.round_should_check_for_win = !GLOB.round_should_check_for_win
+ if (GLOB.round_should_check_for_win)
message_admins("[key_name(src)] enabled checking for round-end.")
else
message_admins("[key_name(src)] disabled checking for round-end.")
@@ -333,17 +333,17 @@
individual_counts["[M.type]"]++
for(var/mob/M in SShuman.processable_human_list)
individual_counts["[M.type]"]++
- for(var/obj/structure/machinery/M in processing_machines)
+ for(var/obj/structure/machinery/M in GLOB.processing_machines)
individual_counts["[M.type]"]++
- for(var/datum/powernet/M in powernets)
+ for(var/datum/powernet/M in GLOB.powernets)
individual_counts["[M.type]"]++
for(var/mob/M in SSmob.living_misc_mobs)
individual_counts["[M.type]"]++
- for(var/datum/nanoui/M in nanomanager.processing_uis)
+ for(var/datum/nanoui/M in SSnano.nanomanager.processing_uis)
individual_counts["[M.type]"]++
- for(var/datum/powernet/M in powernets)
+ for(var/datum/powernet/M in GLOB.powernets)
individual_counts["[M.type]"]++
- for(var/datum/M in power_machines)
+ for(var/datum/M in GLOB.power_machines)
individual_counts["[M.type]"]++
for(var/mob/M in GLOB.xeno_mob_list)
individual_counts["[M.type]"]++
diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm
index 351d281e1881..abb43461c2fe 100644
--- a/code/modules/admin/verbs/mob_verbs.dm
+++ b/code/modules/admin/verbs/mob_verbs.dm
@@ -24,7 +24,7 @@
message_admins("[key_name_admin(usr)] modified [key_name(M)]'s ckey to [new_ckey]", 1)
M.ckey = new_ckey
- M.client?.change_view(world_view_size)
+ M.client?.change_view(GLOB.world_view_size)
/client/proc/cmd_admin_changekey(mob/O in GLOB.mob_list)
set name = "Change CKey"
@@ -72,13 +72,13 @@
var/datum/mob_hud/H
switch(hud_choice)
if("Medical HUD")
- H = huds[MOB_HUD_MEDICAL_ADVANCED]
+ H = GLOB.huds[MOB_HUD_MEDICAL_ADVANCED]
if("Security HUD")
- H = huds[MOB_HUD_SECURITY_ADVANCED]
+ H = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
if("Squad HUD")
- H = huds[MOB_HUD_FACTION_OBSERVER]
+ H = GLOB.huds[MOB_HUD_FACTION_OBSERVER]
if("Xeno Status HUD")
- H = huds[MOB_HUD_XENO_STATUS]
+ H = GLOB.huds[MOB_HUD_XENO_STATUS]
else return
H.add_hud_to(M, HUD_SOURCE_ADMIN)
@@ -220,7 +220,7 @@
"Narrating as [selected.name]")
if(!message) return
- var/list/heard = get_mobs_in_view(world_view_size, selected)
+ var/list/heard = get_mobs_in_view(GLOB.world_view_size, selected)
switch(type)
if(NARRATION_METHOD_SAY)
diff --git a/code/modules/admin/verbs/select_equipment.dm b/code/modules/admin/verbs/select_equipment.dm
index b684fc0d6f95..7e78652c5c35 100644
--- a/code/modules/admin/verbs/select_equipment.dm
+++ b/code/modules/admin/verbs/select_equipment.dm
@@ -5,7 +5,7 @@
alert("Invalid mob")
return
- var/rank_list = list("Custom", "Weyland-Yutani") + RoleAuthority.roles_by_name
+ var/rank_list = list("Custom", "Weyland-Yutani") + GLOB.RoleAuthority.roles_by_name
var/newrank = tgui_input_list(usr, "Select new rank for [H]", "Change the mob's rank and skills", rank_list)
if (!newrank)
@@ -14,8 +14,8 @@
return
var/obj/item/card/id/I = H.wear_id
- if(RoleAuthority.roles_by_name[newrank])
- var/datum/job/J = RoleAuthority.roles_by_name[newrank]
+ if(GLOB.RoleAuthority.roles_by_name[newrank])
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[newrank]
H.comm_title = J.get_comm_title()
H.set_skills(J.get_skills())
if(istype(I))
@@ -44,14 +44,14 @@
H.faction = FACTION_WY
H.faction_group = FACTION_LIST_WY
- var/newskillset = tgui_input_list(usr, "Select a skillset", "Skill Set", (list("Keep Skillset") +RoleAuthority.roles_by_name))
+ var/newskillset = tgui_input_list(usr, "Select a skillset", "Skill Set", (list("Keep Skillset") +GLOB.RoleAuthority.roles_by_name))
if(!newskillset || newskillset == "Keep Skillset")
return
if(!H)
return
- var/datum/job/J = RoleAuthority.roles_by_name[newskillset]
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[newskillset]
H.set_skills(J.get_skills())
if("Custom")
@@ -88,14 +88,14 @@
new_faction = FACTION_NEUTRAL
H.faction = new_faction
- var/newskillset = tgui_input_list(usr, "Select a skillset", "Skill Set", RoleAuthority.roles_by_name)
+ var/newskillset = tgui_input_list(usr, "Select a skillset", "Skill Set", GLOB.RoleAuthority.roles_by_name)
if(!newskillset)
return
if(!H)
return
- var/datum/job/J = RoleAuthority.roles_by_name[newskillset]
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[newskillset]
H.set_skills(J.get_skills())
/client/proc/cmd_admin_dress(mob/M)
diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm
index cb90db9e8535..42aac0e6c0f6 100644
--- a/code/modules/almayer/machinery.dm
+++ b/code/modules/almayer/machinery.dm
@@ -196,7 +196,7 @@
var/obj/item/dogtag/D = I
if(D.fallen_names)
to_chat(user, SPAN_NOTICE("You add [D] to [src]."))
- fallen_list += D.fallen_names
+ GLOB.fallen_list += D.fallen_names
qdel(D)
return TRUE
else
@@ -204,13 +204,13 @@
/obj/structure/prop/almayer/ship_memorial/get_examine_text(mob/user)
. = ..()
- if((isobserver(user) || ishuman(user)) && fallen_list)
+ if((isobserver(user) || ishuman(user)) && GLOB.fallen_list)
var/faltext = ""
- for(var/i = 1 to fallen_list.len)
- if(i != fallen_list.len)
- faltext += "[fallen_list[i]], "
+ for(var/i = 1 to GLOB.fallen_list.len)
+ if(i != GLOB.fallen_list.len)
+ faltext += "[GLOB.fallen_list[i]], "
else
- faltext += fallen_list[i]
+ faltext += GLOB.fallen_list[i]
. += SPAN_NOTICE("To our fallen soldiers:
[faltext].")
/obj/structure/prop/almayer/particle_cannon
diff --git a/code/modules/almayer/shakeship.dm b/code/modules/almayer/shakeship.dm
index c3f359c9a77c..29d9b7a762f8 100644
--- a/code/modules/almayer/shakeship.dm
+++ b/code/modules/almayer/shakeship.dm
@@ -35,7 +35,7 @@
playsound_client(current_mob.client, 'sound/effects/bigboom3.ogg', 100)
if(drop)
- INVOKE_ASYNC(current_mob, TYPE_PROC_REF(/atom/movable, throw_atom), get_ranged_target_turf(current_mob, pick(cardinal), sstrength-5), pick(cardinal), sstrength)
+ INVOKE_ASYNC(current_mob, TYPE_PROC_REF(/atom/movable, throw_atom), get_ranged_target_turf(current_mob, pick(GLOB.cardinals), sstrength-5), pick(GLOB.cardinals), sstrength)
to_chat(current_mob, SPAN_HIGHDANGER("YOU ARE THROWN AROUND VIOLENTLY AND HIT THE DECK WITH FULL FORCE!!"))
if(current_mob.client && osound)
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index d1e7f83dacb1..02c78faccea8 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -285,7 +285,7 @@
list("SL", "hudsquad_leader"),
)
- for(var/datum/squad/marine/squad in RoleAuthority.squads)
+ for(var/datum/squad/marine/squad in GLOB.RoleAuthority.squads)
var/color = squad.equipment_color
for(var/iref in icon_data)
var/list/iconref = iref
diff --git a/code/modules/buildmode/submodes/variable_edit.dm b/code/modules/buildmode/submodes/variable_edit.dm
index da4620b157a6..7517012583da 100644
--- a/code/modules/buildmode/submodes/variable_edit.dm
+++ b/code/modules/buildmode/submodes/variable_edit.dm
@@ -44,7 +44,7 @@
if(TYPE_OBJ_REFERENCE)
selected_value = input(usr,"Enter variable value:" ,"Value") as obj in world
if(TYPE_TURF_REFERENCE)
- selected_value = input(usr,"Enter variable value:" ,"Value") as turf in turfs
+ selected_value = input(usr,"Enter variable value:" ,"Value") as turf in GLOB.turfs
#undef TYPE_TEXT
#undef TYPE_NUMBER
diff --git a/code/modules/clans/client.dm b/code/modules/clans/client.dm
index d1f403c08300..c46adf89711a 100644
--- a/code/modules/clans/client.dm
+++ b/code/modules/clans/client.dm
@@ -5,12 +5,12 @@
set waitfor = FALSE
. = ..()
- if(RoleAuthority && (RoleAuthority.roles_whitelist[ckey] & WHITELIST_PREDATOR))
+ if(GLOB.RoleAuthority && (GLOB.RoleAuthority.roles_whitelist[ckey] & WHITELIST_PREDATOR))
clan_info = GET_CLAN_PLAYER(player.id)
clan_info.sync()
- if(RoleAuthority.roles_whitelist[ckey] & WHITELIST_YAUTJA_LEADER)
- clan_info.clan_rank = clan_ranks_ordered[CLAN_RANK_ADMIN]
+ if(GLOB.RoleAuthority.roles_whitelist[ckey] & WHITELIST_YAUTJA_LEADER)
+ clan_info.clan_rank = GLOB.clan_ranks_ordered[CLAN_RANK_ADMIN]
clan_info.permissions |= CLAN_PERMISSION_ALL
else
clan_info.permissions &= ~CLAN_PERMISSION_ADMIN_MANAGER // Only the leader can manage the ancients
@@ -157,7 +157,7 @@
var/list/player = list(
player_id = CP.player_id,
name = CP.ckey,
- rank = clan_ranks[CP.clan_rank], // rank_to_give not used here, because we need to get their visual rank, not their position
+ rank = GLOB.clan_ranks[CP.clan_rank], // rank_to_give not used here, because we need to get their visual rank, not their position
rank_pos = rank_to_give,
honor = (CP.honor? CP.honor : 0)
)
@@ -166,7 +166,7 @@
data["clan_keys"] = clan_members
- var/datum/nanoui/ui = nanomanager.try_update_ui(mob, mob, "clan_status_ui", null, data)
+ var/datum/nanoui/ui = SSnano.nanomanager.try_update_ui(mob, mob, "clan_status_ui", null, data)
if(!ui)
ui = new(mob, mob, "clan_status_ui", "clan_menu.tmpl", "Clan Menu", 550, 500)
ui.set_initial_data(data)
@@ -295,8 +295,8 @@
pl.sync()
pl.clan_id = null
- pl.permissions = clan_ranks[CLAN_RANK_UNBLOODED].permissions
- pl.clan_rank = clan_ranks_ordered[CLAN_RANK_UNBLOODED]
+ pl.permissions = GLOB.clan_ranks[CLAN_RANK_UNBLOODED].permissions
+ pl.clan_rank = GLOB.clan_ranks_ordered[CLAN_RANK_UNBLOODED]
pl.save()
@@ -377,16 +377,16 @@
if(input == "Remove from clan" && target.clan_id)
target.clan_id = null
- target.clan_rank = clan_ranks_ordered[CLAN_RANK_YOUNG]
+ target.clan_rank = GLOB.clan_ranks_ordered[CLAN_RANK_YOUNG]
to_chat(src, SPAN_NOTICE("Removed [player_name] from their clan."))
log_and_message_admins("[key_name_admin(src)] has removed [player_name] from their current clan.")
else if(input == "Remove from Ancient")
- target.clan_rank = clan_ranks_ordered[CLAN_RANK_YOUNG]
- target.permissions = clan_ranks[CLAN_RANK_YOUNG].permissions
+ target.clan_rank = GLOB.clan_ranks_ordered[CLAN_RANK_YOUNG]
+ target.permissions = GLOB.clan_ranks[CLAN_RANK_YOUNG].permissions
to_chat(src, SPAN_NOTICE("Removed [player_name] from ancient."))
log_and_message_admins("[key_name_admin(src)] has removed [player_name] from ancient.")
else if(input == "Make Ancient" && is_clan_manager)
- target.clan_rank = clan_ranks_ordered[CLAN_RANK_ADMIN]
+ target.clan_rank = GLOB.clan_ranks_ordered[CLAN_RANK_ADMIN]
target.permissions = CLAN_PERMISSION_ADMIN_ANCIENT
to_chat(src, SPAN_NOTICE("Made [player_name] an ancient."))
log_and_message_admins("[key_name_admin(src)] has made [player_name] an ancient.")
@@ -397,15 +397,15 @@
target.clan_id = clans[input]
if(!(target.permissions & CLAN_PERMISSION_ADMIN_ANCIENT))
- target.permissions = clan_ranks[CLAN_RANK_BLOODED].permissions
- target.clan_rank = clan_ranks_ordered[CLAN_RANK_BLOODED]
+ target.permissions = GLOB.clan_ranks[CLAN_RANK_BLOODED].permissions
+ target.clan_rank = GLOB.clan_ranks_ordered[CLAN_RANK_BLOODED]
if(CLAN_ACTION_PLAYER_MODIFYRANK)
if(!target.clan_id)
to_chat(src, SPAN_WARNING("This player doesn't belong to a clan!"))
return
- var/list/datum/yautja_rank/ranks = clan_ranks.Copy()
+ var/list/datum/yautja_rank/ranks = GLOB.clan_ranks.Copy()
ranks -= CLAN_RANK_ADMIN // Admin rank should not and cannot be obtained from here
var/datum/yautja_rank/chosen_rank
@@ -430,7 +430,7 @@
chosen_rank = ranks[input]
if(chosen_rank.limit_type)
- var/list/datum/view_record/clan_playerbase_view/CPV = DB_VIEW(/datum/view_record/clan_playerbase_view/, DB_AND(DB_COMP("clan_id", DB_EQUALS, target.clan_id), DB_COMP("rank", DB_EQUALS, clan_ranks_ordered[input])))
+ var/list/datum/view_record/clan_playerbase_view/CPV = DB_VIEW(/datum/view_record/clan_playerbase_view/, DB_AND(DB_COMP("clan_id", DB_EQUALS, target.clan_id), DB_COMP("rank", DB_EQUALS, GLOB.clan_ranks_ordered[input])))
var/players_in_rank = CPV.len
switch(chosen_rank.limit_type)
@@ -453,7 +453,7 @@
if(!has_clan_permission(chosen_rank.permission_required)) // Double check
return
- target.clan_rank = clan_ranks_ordered[chosen_rank.name]
+ target.clan_rank = GLOB.clan_ranks_ordered[chosen_rank.name]
target.permissions = chosen_rank.permissions
log_and_message_admins("[key_name_admin(src)] has set the rank of [player_name] to [chosen_rank.name] for their clan.")
to_chat(src, SPAN_NOTICE("Set [player_name]'s rank to [chosen_rank.name]"))
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 9268cd3aadba..ec1b48989fc4 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -311,20 +311,20 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
if(isnull(address) || (address in localhost_addresses))
var/datum/admins/admin = new("!localhost!", RL_HOST, ckey)
admin.associate(src)
- RoleAuthority.roles_whitelist[ckey] = WHITELIST_EVERYTHING
+ GLOB.RoleAuthority.roles_whitelist[ckey] = WHITELIST_EVERYTHING
//Admin Authorisation
- admin_holder = admin_datums[ckey]
+ admin_holder = GLOB.admin_datums[ckey]
if(admin_holder)
admin_holder.associate(src)
notify_login()
add_pref_verbs()
//preferences datum - also holds some persistent data for the client (because we may as well keep these datums to a minimum)
- prefs = preferences_datums[ckey]
+ prefs = GLOB.preferences_datums[ckey]
if(QDELETED(prefs) || !istype(prefs))
prefs = new /datum/preferences(src)
- preferences_datums[ckey] = prefs
+ GLOB.preferences_datums[ckey] = prefs
prefs.client_reconnected(src)
prefs.last_ip = address //these are gonna be used for banning
prefs.last_id = computer_id //these are gonna be used for banning
@@ -344,7 +344,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
player_details.byond_version = full_version
GLOB.player_details[ckey] = player_details
- view = world_view_size
+ view = GLOB.world_view_size
. = ..() //calls mob.Login()
if(SSinput.initialized)
@@ -398,10 +398,6 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
CEI = GLOB.custom_event_info_list[mob.faction]
CEI.show_player_event_info(src)
- if( (world.address == address || !address) && !host )
- host = key
- world.update_status()
-
connection_time = world.time
winset(src, null, "command=\".configure graphics-hwmode on\"")
@@ -435,7 +431,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
load_player_data()
- view = world_view_size
+ view = GLOB.world_view_size
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CLIENT_LOGIN, src)
@@ -527,17 +523,17 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
/proc/setup_player_entity(ckey)
if(!ckey)
return
- if(player_entities["[ckey]"])
- return player_entities["[ckey]"]
+ if(GLOB.player_entities["[ckey]"])
+ return GLOB.player_entities["[ckey]"]
var/datum/entity/player_entity/P = new()
P.ckey = ckey
P.name = ckey
- player_entities["[ckey]"] = P
+ GLOB.player_entities["[ckey]"] = P
// P.setup_save(ckey)
return P
/proc/save_player_entities()
- for(var/key_ref in player_entities)
+ for(var/key_ref in GLOB.player_entities)
// var/datum/entity/player_entity/P = player_entities["[key_ref]"]
// P.save_statistics()
log_debug("STATISTICS: Statistics saving complete.")
diff --git a/code/modules/client/country_flags.dm b/code/modules/client/country_flags.dm
index 7d49bf836977..4955c446aea1 100644
--- a/code/modules/client/country_flags.dm
+++ b/code/modules/client/country_flags.dm
@@ -26,10 +26,10 @@
else //null response, ratelimited most likely. Try again in 60s
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ip2country), ipaddr, origin), 60 SECONDS)
-var/list/countries = icon_states('icons/flags.dmi')
+GLOBAL_LIST_INIT(countries, icon_states('icons/flags.dmi'))
/proc/country2chaticon(country_code, targets)
- if(countries.Find(country_code))
+ if(GLOB.countries.Find(country_code))
return "[icon2html('icons/flags.dmi', targets, country_code)]"
else
return "[icon2html('icons/flags.dmi', targets, "unknown")]"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 04b82628e3c6..14e9ee68bc1a 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -7,7 +7,7 @@
#define MENU_SETTINGS "settings"
#define MENU_SPECIAL "special"
-var/list/preferences_datums = list()
+GLOBAL_LIST_EMPTY(preferences_datums)
GLOBAL_LIST_INIT(stylesheets, list(
"Modern" = "common.css",
@@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(bgstate_options, list(
"whitefull"
))
-var/const/MAX_SAVE_SLOTS = 10
+#define MAX_SAVE_SLOTS 10
/datum/preferences
var/client/owner
@@ -306,13 +306,13 @@ var/const/MAX_SAVE_SLOTS = 10
dat += "
"
dat += "Human - "
dat += "Xenomorph - "
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_COMMANDER)
+ if(GLOB.RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_COMMANDER)
dat += "Commanding Officer - "
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_SYNTHETIC)
+ if(GLOB.RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_SYNTHETIC)
dat += "Synthetic - "
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_PREDATOR)
+ if(GLOB.RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_PREDATOR)
dat += "Yautja - "
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_MENTOR)
+ if(GLOB.RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_MENTOR)
dat += "Mentor - "
dat += "Settings - "
dat += "Special Roles"
@@ -382,7 +382,7 @@ var/const/MAX_SAVE_SLOTS = 10
dat += "Underwear: [underwear]
"
dat += "Undershirt: [undershirt]
"
- dat += "Backpack Type: [backbaglist[backbag]]
"
+ dat += "Backpack Type: [GLOB.backbaglist[backbag]]
"
dat += "Preferred Armor: [preferred_armor]
"
@@ -398,7 +398,7 @@ var/const/MAX_SAVE_SLOTS = 10
if(length(gear))
dat += "
"
for(var/i = 1; i <= gear.len; i++)
- var/datum/gear/G = gear_datums_by_name[gear[i]]
+ var/datum/gear/G = GLOB.gear_datums_by_name[gear[i]]
if(G)
total_cost += G.cost
dat += "[gear[i]] ([G.cost] points) Remove
"
@@ -482,7 +482,7 @@ var/const/MAX_SAVE_SLOTS = 10
n++
if(MENU_CO)
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_COMMANDER)
+ if(GLOB.RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_COMMANDER)
dat += ""
dat += "
Commander Settings:
"
dat += "
Commander Whitelist Status: [commander_status]"
@@ -492,7 +492,7 @@ var/const/MAX_SAVE_SLOTS = 10
else
dat += "
You do not have the whitelist for this role."
if(MENU_SYNTHETIC)
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_SYNTHETIC)
+ if(GLOB.RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_SYNTHETIC)
dat += "
"
dat += "
Synthetic Settings:
"
dat += "
Synthetic Name: [synthetic_name]"
@@ -502,7 +502,7 @@ var/const/MAX_SAVE_SLOTS = 10
else
dat += "
You do not have the whitelist for this role."
if(MENU_YAUTJA)
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_PREDATOR)
+ if(GLOB.RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_PREDATOR)
dat += "
"
dat += "
Yautja Information:
"
dat += "
Yautja Name: [predator_name]"
@@ -516,7 +516,7 @@ var/const/MAX_SAVE_SLOTS = 10
dat += "
"
@@ -650,7 +650,7 @@ var/const/MAX_SAVE_SLOTS = 10
//width - Screen' width. Defaults to 550 to make it look nice.
//height - Screen's height. Defaults to 500 to make it look nice.
/datum/preferences/proc/SetChoices(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700)
- if(!RoleAuthority)
+ if(!GLOB.RoleAuthority)
return
var/HTML = ""
@@ -665,10 +665,10 @@ var/const/MAX_SAVE_SLOTS = 10
var/list/active_role_names = GLOB.gamemode_roles[GLOB.master_mode]
if(!active_role_names)
- active_role_names = ROLES_DISTRESS_SIGNAL
+ active_role_names = GLOB.ROLES_DISTRESS_SIGNAL
for(var/role_name as anything in active_role_names)
- var/datum/job/job = RoleAuthority.roles_by_name[role_name]
+ var/datum/job/job = GLOB.RoleAuthority.roles_by_name[role_name]
if(!job)
debug_log("Missing job for prefs: [role_name]")
continue
@@ -682,7 +682,7 @@ var/const/MAX_SAVE_SLOTS = 10
if(jobban_isbanned(user, job.title))
HTML += "
[job.disp_title] | BANNED | "
continue
- else if(job.flags_startup_parameters & ROLE_WHITELISTED && !(RoleAuthority.roles_whitelist[user.ckey] & job.flags_whitelist))
+ else if(job.flags_startup_parameters & ROLE_WHITELISTED && !(GLOB.RoleAuthority.roles_whitelist[user.ckey] & job.flags_whitelist))
HTML += "
[job.disp_title] | WHITELISTED | "
continue
else if(!job.can_play_role(user.client))
@@ -763,7 +763,7 @@ var/const/MAX_SAVE_SLOTS = 10
//width - Screen' width. Defaults to 550 to make it look nice.
//height - Screen's height. Defaults to 500 to make it look nice.
/datum/preferences/proc/set_job_slots(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700)
- if(!RoleAuthority)
+ if(!GLOB.RoleAuthority)
return
var/HTML = ""
@@ -778,10 +778,10 @@ var/const/MAX_SAVE_SLOTS = 10
var/list/active_role_names = GLOB.gamemode_roles[GLOB.master_mode]
if(!active_role_names)
- active_role_names = ROLES_DISTRESS_SIGNAL
+ active_role_names = GLOB.ROLES_DISTRESS_SIGNAL
for(var/role_name as anything in active_role_names)
- var/datum/job/job = RoleAuthority.roles_by_name[role_name]
+ var/datum/job/job = GLOB.RoleAuthority.roles_by_name[role_name]
if(!job)
debug_log("Missing job for prefs: [role_name]")
continue
@@ -794,7 +794,7 @@ var/const/MAX_SAVE_SLOTS = 10
if(jobban_isbanned(user, job.title))
HTML += "
[job.disp_title]BANNED | "
continue
- else if(job.flags_startup_parameters & ROLE_WHITELISTED && !(RoleAuthority.roles_whitelist[user.ckey] & job.flags_whitelist))
+ else if(job.flags_startup_parameters & ROLE_WHITELISTED && !(GLOB.RoleAuthority.roles_whitelist[user.ckey] & job.flags_whitelist))
HTML += "
[job.disp_title]WHITELISTED | "
continue
else if(!job.can_play_role(user.client))
@@ -874,7 +874,7 @@ var/const/MAX_SAVE_SLOTS = 10
return
/datum/preferences/proc/SetJob(mob/user, role, priority)
- var/datum/job/job = RoleAuthority.roles_by_name[role]
+ var/datum/job/job = GLOB.RoleAuthority.roles_by_name[role]
if(!job)
close_browser(user, "mob_occupation")
ShowChoices(user)
@@ -891,12 +891,12 @@ var/const/MAX_SAVE_SLOTS = 10
job_preference_list[job] = NEVER_PRIORITY
return
- if(!RoleAuthority)
+ if(!GLOB.RoleAuthority)
return
job_preference_list = list()
- for(var/role in RoleAuthority.roles_by_path)
- var/datum/job/J = RoleAuthority.roles_by_path[role]
+ for(var/role in GLOB.RoleAuthority.roles_by_path)
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_path[role]
job_preference_list[J.title] = NEVER_PRIORITY
/datum/preferences/proc/get_job_priority(J)
@@ -955,12 +955,12 @@ var/const/MAX_SAVE_SLOTS = 10
/datum/preferences/proc/reset_job_slots()
pref_job_slots = list()
var/datum/job/J
- for(var/role in RoleAuthority.roles_by_path)
- J = RoleAuthority.roles_by_path[role]
+ for(var/role in GLOB.RoleAuthority.roles_by_path)
+ J = GLOB.RoleAuthority.roles_by_path[role]
pref_job_slots[J.title] = JOB_SLOT_CURRENT_SLOT
/datum/preferences/proc/process_link(mob/user, list/href_list)
- var/whitelist_flags = RoleAuthority.roles_whitelist[user.ckey]
+ var/whitelist_flags = GLOB.RoleAuthority.roles_whitelist[user.ckey]
switch(href_list["preference"])
if("job")
@@ -1007,10 +1007,10 @@ var/const/MAX_SAVE_SLOTS = 10
if("loadout")
switch(href_list["task"])
if("input")
- var/gear_category = tgui_input_list(user, "Select gear category: ", "Gear to add", gear_datums_by_category)
+ var/gear_category = tgui_input_list(user, "Select gear category: ", "Gear to add", GLOB.gear_datums_by_category)
if(!gear_category)
return
- var/choice = tgui_input_list(user, "Select gear to add: ", gear_category, gear_datums_by_category[gear_category])
+ var/choice = tgui_input_list(user, "Select gear to add: ", gear_category, GLOB.gear_datums_by_category[gear_category])
if(!choice)
return
@@ -1020,10 +1020,10 @@ var/const/MAX_SAVE_SLOTS = 10
gear = list()
if(gear.len)
for(var/gear_name in gear)
- G = gear_datums_by_name[gear_name]
+ G = GLOB.gear_datums_by_name[gear_name]
total_cost += G?.cost
- G = gear_datums_by_category[gear_category][choice]
+ G = GLOB.gear_datums_by_category[gear_category][choice]
total_cost += G.cost
if(total_cost <= MAX_GEAR_COST)
gear += G.display_name
@@ -1283,8 +1283,8 @@ var/const/MAX_SAVE_SLOTS = 10
return
predator_caster_material = new_pred_caster_mat
if("pred_cape_type")
- var/datum/job/J = RoleAuthority.roles_by_name[JOB_PREDATOR]
- var/whitelist_status = clan_ranks_ordered[J.get_whitelist_status(RoleAuthority.roles_whitelist, owner)]
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_PREDATOR]
+ var/whitelist_status = GLOB.clan_ranks_ordered[J.get_whitelist_status(GLOB.RoleAuthority.roles_whitelist, owner)]
var/list/options = list("None" = "None")
for(var/cape_name in GLOB.all_yautja_capes)
@@ -1603,9 +1603,9 @@ var/const/MAX_SAVE_SLOTS = 10
ooccolor = new_ooccolor
if("bag")
- var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in backbaglist
+ var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in GLOB.backbaglist
if(new_backbag)
- backbag = backbaglist.Find(new_backbag)
+ backbag = GLOB.backbaglist.Find(new_backbag)
if("nt_relation")
var/new_relation = input(user, "Choose your relation to the Weyland-Yutani company. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference") as null|anything in list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")
@@ -1706,7 +1706,7 @@ var/const/MAX_SAVE_SLOTS = 10
origin = choice
if("religion")
- var/choice = tgui_input_list(user, "Please choose a religion.", "Religion choice", religion_choices + "Other")
+ var/choice = tgui_input_list(user, "Please choose a religion.", "Religion choice", GLOB.religion_choices + "Other")
if(!choice)
return
if(choice == "Other")
@@ -1717,7 +1717,7 @@ var/const/MAX_SAVE_SLOTS = 10
religion = choice
if("special_job_select")
- var/datum/job/job = RoleAuthority.roles_by_name[href_list["text"]]
+ var/datum/job/job = GLOB.RoleAuthority.roles_by_name[href_list["text"]]
if(!job)
close_browser(user, "mob_occupation")
ShowChoices(user)
@@ -2006,9 +2006,9 @@ var/const/MAX_SAVE_SLOTS = 10
var/firstspace = findtext(real_name, " ")
var/name_length = length(real_name)
if(!firstspace) //we need a surname
- real_name += " [pick(last_names)]"
+ real_name += " [pick(GLOB.last_names)]"
else if(firstspace == name_length)
- real_name += "[pick(last_names)]"
+ real_name += "[pick(GLOB.last_names)]"
character.real_name = real_name
character.voice = real_name
@@ -2209,7 +2209,7 @@ var/const/MAX_SAVE_SLOTS = 10
if (key in key_mod_buf)
return
- if (key in key_mods)
+ if (key in GLOB.key_mods)
key_mod_buf.Add(key)
/datum/preferences/proc/set_key_buf(client/source, key)
diff --git a/code/modules/client/preferences_factions.dm b/code/modules/client/preferences_factions.dm
index 6f10f9dc1df5..42041d846787 100644
--- a/code/modules/client/preferences_factions.dm
+++ b/code/modules/client/preferences_factions.dm
@@ -1,4 +1,4 @@
-var/global/list/religion_choices = list(
+GLOBAL_LIST_INIT(religion_choices, list(
RELIGION_PROTESTANT,
RELIGION_CATHOLIC,
RELIGION_ORTHODOX,
@@ -16,4 +16,4 @@ var/global/list/religion_choices = list(
RELIGION_MINOR,
RELIGION_ATHEISM,
RELIGION_AGNOSTICISM
- )
+ ))
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index 4b937b0135b3..b2580be42753 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -1,5 +1,5 @@
-var/global/list/gear_datums_by_category = list()
-var/global/list/gear_datums_by_name = list()
+GLOBAL_LIST_EMPTY(gear_datums_by_category)
+GLOBAL_LIST_EMPTY(gear_datums_by_name)
/proc/populate_gear_list()
var/datum/gear/G
@@ -10,11 +10,11 @@ var/global/list/gear_datums_by_name = list()
if(!G.category)
log_debug("Improper gear datum: [gear_type].")
continue
- if(G.display_name in gear_datums_by_name)
+ if(G.display_name in GLOB.gear_datums_by_name)
log_debug("Duplicate gear datum name: [G.display_name].")
continue
- LAZYSET(gear_datums_by_category[G.category], "[G.display_name] [G.cost == 1 ? "(1 point)" : "([G.cost] points)"]", G)
- gear_datums_by_name[G.display_name] = G
+ LAZYSET(GLOB.gear_datums_by_category[G.category], "[G.display_name] [G.cost == 1 ? "(1 point)" : "([G.cost] points)"]", G)
+ GLOB.gear_datums_by_name[G.display_name] = G
/datum/gear
var/display_name // Name/index.
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index c885e9b73af1..e80e5bd8c5ba 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -11,8 +11,8 @@
//if a file was updated, return 1
/datum/preferences/proc/savefile_update(savefile/S)
if(!isnum(savefile_version) || savefile_version < SAVEFILE_VERSION_MIN) //lazily delete everything + additional files so they can be saved in the new format
- for(var/ckey in preferences_datums)
- var/datum/preferences/D = preferences_datums[ckey]
+ for(var/ckey in GLOB.preferences_datums)
+ var/datum/preferences/D = GLOB.preferences_datums[ckey]
if(D == src)
var/delpath = "data/player_saves/[copytext(ckey,1,2)]/[ckey]/"
if(delpath && fexists(delpath))
@@ -261,11 +261,11 @@
predator_h_style = sanitize_inlist(predator_h_style, GLOB.yautja_hair_styles_list, initial(predator_h_style))
predator_skin_color = sanitize_inlist(predator_skin_color, PRED_SKIN_COLOR, initial(predator_skin_color))
predator_flavor_text = predator_flavor_text ? sanitize_text(predator_flavor_text, initial(predator_flavor_text)) : initial(predator_flavor_text)
- commander_status = sanitize_inlist(commander_status, whitelist_hierarchy, initial(commander_status))
+ commander_status = sanitize_inlist(commander_status, GLOB.whitelist_hierarchy, initial(commander_status))
commander_sidearm = sanitize_inlist(commander_sidearm, (CO_GUNS + COUNCIL_CO_GUNS), initial(commander_sidearm))
affiliation = sanitize_inlist(affiliation, FACTION_ALLEGIANCE_USCM_COMMANDER, initial(affiliation))
- yautja_status = sanitize_inlist(yautja_status, whitelist_hierarchy + list("Elder"), initial(yautja_status))
- synth_status = sanitize_inlist(synth_status, whitelist_hierarchy, initial(synth_status))
+ yautja_status = sanitize_inlist(yautja_status, GLOB.whitelist_hierarchy + list("Elder"), initial(yautja_status))
+ synth_status = sanitize_inlist(synth_status, GLOB.whitelist_hierarchy, initial(synth_status))
key_bindings = sanitize_keybindings(key_bindings)
remembered_key_bindings = sanitize_islist(remembered_key_bindings, null)
hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, TRUE)
@@ -520,7 +520,7 @@
b_eyes = sanitize_integer(b_eyes, 0, 255, initial(b_eyes))
underwear = sanitize_inlist(underwear, gender == MALE ? GLOB.underwear_m : GLOB.underwear_f, initial(underwear))
undershirt = sanitize_inlist(undershirt, gender == MALE ? GLOB.undershirt_m : GLOB.undershirt_f, initial(undershirt))
- backbag = sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
+ backbag = sanitize_integer(backbag, 1, GLOB.backbaglist.len, initial(backbag))
preferred_armor = sanitize_inlist(preferred_armor, GLOB.armor_style_list, "Random")
//b_type = sanitize_text(b_type, initial(b_type))
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index 6f9026a437dd..674ecaceeae2 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -59,12 +59,6 @@
break_sound.priority = 250
src << break_sound //breaks the client's sound output on SOUND_CHANNEL_ADMIN_MIDI
if(src.mob.client.midi_silenced) return
- if(midi_playing)
- total_silenced++
- message_admins("A player has silenced the currently playing midi. Total: [total_silenced] player(s).", 1)
- src.mob.client.midi_silenced = 1
- spawn(30 SECONDS) // Prevents message_admins() spam. Should match with the midi_playing_timer spawn() in playsound.dm
- src.mob.client.midi_silenced = 0
else
to_chat(src, SPAN_BOLDNOTICE("You have 'Play Admin Midis' disabled in your Character Setup, so this verb is useless to you."))
@@ -562,7 +556,7 @@
set category = "Preferences"
set desc = "Shows ghost-related preferences."
- add_verb(src, ghost_prefs_verbs)
+ add_verb(src, GLOB.ghost_prefs_verbs)
remove_verb(src, /client/proc/show_ghost_preferences)
/client/proc/hide_ghost_preferences() // Hides ghost-related preferences.
@@ -570,7 +564,7 @@
set category = "Preferences"
set desc = "Hides ghost-related preferences."
- remove_verb(src, ghost_prefs_verbs)
+ remove_verb(src, GLOB.ghost_prefs_verbs)
add_verb(src, /client/proc/show_ghost_preferences)
/client/proc/toggle_ghost_hivemind()
@@ -636,21 +630,21 @@
var/datum/mob_hud/H
switch(hud_choice)
if("Medical HUD")
- H = huds[MOB_HUD_MEDICAL_OBSERVER]
+ H = GLOB.huds[MOB_HUD_MEDICAL_OBSERVER]
if("Security HUD")
- H = huds[MOB_HUD_SECURITY_ADVANCED]
+ H = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
if("Squad HUD")
- H = huds[MOB_HUD_FACTION_OBSERVER]
+ H = GLOB.huds[MOB_HUD_FACTION_OBSERVER]
if("Xeno Status HUD")
- H = huds[MOB_HUD_XENO_STATUS]
+ H = GLOB.huds[MOB_HUD_XENO_STATUS]
if("Faction UPP HUD")
- H = huds[MOB_HUD_FACTION_UPP]
+ H = GLOB.huds[MOB_HUD_FACTION_UPP]
if("Faction Wey-Yu HUD")
- H = huds[MOB_HUD_FACTION_WY]
+ H = GLOB.huds[MOB_HUD_FACTION_WY]
if("Faction TWE HUD")
- H = huds[MOB_HUD_FACTION_TWE]
+ H = GLOB.huds[MOB_HUD_FACTION_TWE]
if("Faction CLF HUD")
- H = huds[MOB_HUD_FACTION_CLF]
+ H = GLOB.huds[MOB_HUD_FACTION_CLF]
observer_user.HUD_toggled[hud_choice] = prefs.observer_huds[hud_choice]
if(observer_user.HUD_toggled[hud_choice])
@@ -700,7 +694,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH
set name = "Show Combat Chat Prefs"
set desc = "Shows additional chat preferences for combat and ghost messages."
- add_verb(src, combat_chat_prefs_verbs)
+ add_verb(src, GLOB.combat_chat_prefs_verbs)
remove_verb(src, /client/proc/show_combat_chat_preferences)
/client/proc/hide_combat_chat_preferences() // Hides additional chat logs preferences.
@@ -708,7 +702,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH
set name = "Hide Combat Chat Prefs"
set desc = "Hides additional chat preferences for combat and ghost messages."
- remove_verb(src, combat_chat_prefs_verbs)
+ remove_verb(src, GLOB.combat_chat_prefs_verbs)
add_verb(src, /client/proc/show_combat_chat_preferences)
/client/proc/toggle_chat_shooting()
@@ -759,16 +753,16 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH
to_chat(src, SPAN_BOLDNOTICE("As a player, you will now [(prefs.chat_display_preferences & CHAT_TYPE_PAIN) ? "see you being in pain messages" : "never see you being in pain messages"]."))
prefs.save_preferences()
-var/list/combat_chat_prefs_verbs = list(
+GLOBAL_LIST_INIT(combat_chat_prefs_verbs, list(
/client/proc/toggle_chat_shooting,
/client/proc/toggle_chat_xeno_attack,
/client/proc/toggle_chat_xeno_armor,
/client/proc/toggle_chat_someone_hit,
/client/proc/toggle_chat_you_hit,
/client/proc/toggle_chat_you_pain,
- /client/proc/hide_combat_chat_preferences)
+ /client/proc/hide_combat_chat_preferences))
-var/list/ghost_prefs_verbs = list(
+GLOBAL_LIST_INIT(ghost_prefs_verbs, list(
/client/proc/toggle_ghost_ears,
/client/proc/toggle_ghost_sight,
/client/proc/toggle_ghost_radio,
@@ -777,4 +771,4 @@ var/list/ghost_prefs_verbs = list(
/client/proc/toggle_ghost_hud,
/client/proc/toggle_ghost_health_scan,
/client/proc/pick_ghost_orbit,
- /client/proc/hide_ghost_preferences)
+ /client/proc/hide_ghost_preferences))
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index bd87746545d8..4eafeed6c378 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -130,12 +130,12 @@
/obj/item/clothing/ears/earmuffs/New()
. = ..()
- LAZYADD(objects_of_interest, src)
+ LAZYADD(GLOB.objects_of_interest, src)
/obj/item/clothing/ears/earmuffs/Destroy()
. = ..()
- LAZYREMOVE(objects_of_interest, src)
+ LAZYREMOVE(GLOB.objects_of_interest, src)
///////////////////////////////////////////////////////////////////////
diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm
index e4a19b7bed3e..a07e83db7381 100644
--- a/code/modules/clothing/clothing_accessories.dm
+++ b/code/modules/clothing/clothing_accessories.dm
@@ -13,10 +13,10 @@
var/tmp_icon_state = overlay_state? overlay_state : icon_state
if(icon_override && ("[tmp_icon_state]_tie" in icon_states(icon_override)))
inv_overlay = image(icon = icon_override, icon_state = "[tmp_icon_state]_tie", dir = SOUTH)
- else if("[tmp_icon_state]_tie" in icon_states(default_onmob_icons[WEAR_ACCESSORY]))
- inv_overlay = image(icon = default_onmob_icons[WEAR_ACCESSORY], icon_state = "[tmp_icon_state]_tie", dir = SOUTH)
+ else if("[tmp_icon_state]_tie" in icon_states(GLOB.default_onmob_icons[WEAR_ACCESSORY]))
+ inv_overlay = image(icon = GLOB.default_onmob_icons[WEAR_ACCESSORY], icon_state = "[tmp_icon_state]_tie", dir = SOUTH)
else
- inv_overlay = image(icon = default_onmob_icons[WEAR_ACCESSORY], icon_state = tmp_icon_state, dir = SOUTH)
+ inv_overlay = image(icon = GLOB.default_onmob_icons[WEAR_ACCESSORY], icon_state = tmp_icon_state, dir = SOUTH)
inv_overlay.color = color
return inv_overlay
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 853a07ef10a2..8bf58c680798 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -68,7 +68,7 @@
update_clothing_icon()
if(hud_type)
- var/datum/mob_hud/MH = huds[hud_type]
+ var/datum/mob_hud/MH = GLOB.huds[hud_type]
if(active)
MH.add_hud_to(H, src)
playsound(H, 'sound/handling/hud_on.ogg', 25, 1)
@@ -94,7 +94,7 @@
to_chat(user, SPAN_WARNING("You have no idea what any of the data means and power it off before it makes you nauseated."))
else if(hud_type)
- var/datum/mob_hud/MH = huds[hud_type]
+ var/datum/mob_hud/MH = GLOB.huds[hud_type]
MH.add_hud_to(user, src)
user.update_sight()
..()
@@ -102,7 +102,7 @@
/obj/item/clothing/glasses/dropped(mob/living/carbon/human/user)
if(hud_type && active && istype(user))
if(src == user.glasses) //dropped is called before the inventory reference is updated.
- var/datum/mob_hud/H = huds[hud_type]
+ var/datum/mob_hud/H = GLOB.huds[hud_type]
H.remove_hud_from(user, src)
user.glasses = null
user.update_inv_glasses()
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 1a133eee0dfe..9ddaed35826a 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -48,7 +48,7 @@
/obj/item/clothing/glasses/hud/health/ui_data(mob/user)
var/list/data = list(
- "published_documents" = chemical_data.research_publications,
+ "published_documents" = GLOB.chemical_data.research_publications,
"terminal_view" = FALSE
)
return data
@@ -74,7 +74,7 @@
if ("read_document")
var/print_type = params["print_type"]
var/print_title = params["print_title"]
- var/obj/item/paper/research_report/report = chemical_data.get_report(print_type, print_title)
+ var/obj/item/paper/research_report/report = GLOB.chemical_data.get_report(print_type, print_title)
if(report)
report.read_paper(user)
return
@@ -98,7 +98,7 @@
return
if(href_list["read_document"])
- var/obj/item/paper/research_report/report = chemical_data.research_documents[href_list["print_type"]][href_list["print_title"]]
+ var/obj/item/paper/research_report/report = GLOB.chemical_data.research_documents[href_list["print_type"]][href_list["print_title"]]
if(report)
report.read_paper(user)
diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm
index 2a3780832e2a..b2b6f8406dcc 100644
--- a/code/modules/clothing/glasses/night.dm
+++ b/code/modules/clothing/glasses/night.dm
@@ -150,7 +150,7 @@
far_sight = FALSE
if(user)
if(user.client)
- user.client.change_view(world_view_size, src)
+ user.client.change_view(GLOB.world_view_size, src)
STOP_PROCESSING(SSobj, src)
var/datum/action/item_action/m56_goggles/far_sight/FT = locate(/datum/action/item_action/m56_goggles/far_sight) in actions
diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm
index f2be4eaf2062..45a3c51a6701 100644
--- a/code/modules/clothing/spacesuits/breaches.dm
+++ b/code/modules/clothing/spacesuits/breaches.dm
@@ -25,21 +25,21 @@
//Some simple descriptors for breaches. Global because lazy, TODO: work out a better way to do this.
-var/global/list/breach_brute_descriptors = list(
+GLOBAL_LIST_INIT(breach_brute_descriptors, list(
"tiny puncture",
"ragged tear",
"large split",
"huge tear",
"gaping wound"
- )
+ ))
-var/global/list/breach_burn_descriptors = list(
+GLOBAL_LIST_INIT(breach_burn_descriptors, list(
"small burn",
"melted patch",
"sizable burn",
"large scorched area",
"huge scorched area"
- )
+ ))
/datum/breach/proc/update_descriptor()
@@ -47,9 +47,9 @@ var/global/list/breach_burn_descriptors = list(
class = max(1,min(class,5))
//Apply the correct descriptor.
if(damtype == BURN)
- descriptor = breach_burn_descriptors[class]
+ descriptor = GLOB.breach_burn_descriptors[class]
else if(damtype == BRUTE)
- descriptor = breach_brute_descriptors[class]
+ descriptor = GLOB.breach_brute_descriptors[class]
//Repair a certain amount of brute or burn damage to the suit.
/obj/item/clothing/suit/space/proc/repair_breaches(damtype, amount, mob/user)
diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm
index 6cf99cebb673..e86ff3b74cb8 100644
--- a/code/modules/clothing/suits/marine_armor.dm
+++ b/code/modules/clothing/suits/marine_armor.dm
@@ -909,9 +909,9 @@
RegisterSignal(H, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(handle_mob_move_or_look))
- var/datum/mob_hud/security/advanced/SA = huds[MOB_HUD_SECURITY_ADVANCED]
+ var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
SA.remove_from_hud(H)
- var/datum/mob_hud/xeno_infection/XI = huds[MOB_HUD_XENO_INFECTION]
+ var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION]
XI.remove_from_hud(H)
anim(H.loc, H, 'icons/mob/mob.dmi', null, "cloak", null, H.dir)
@@ -941,9 +941,9 @@
REMOVE_TRAIT(H, TRAIT_UNDENSE, SPECIALIST_GEAR_TRAIT)
H.update_canmove()
- var/datum/mob_hud/security/advanced/SA = huds[MOB_HUD_SECURITY_ADVANCED]
+ var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
SA.add_to_hud(H)
- var/datum/mob_hud/xeno_infection/XI = huds[MOB_HUD_XENO_INFECTION]
+ var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION]
XI.add_to_hud(H)
H.visible_message(SPAN_DANGER("[H]'s camouflage fails!"), SPAN_WARNING("Your camouflage fails!"), max_distance = 4)
diff --git a/code/modules/clothing/under/under.dm b/code/modules/clothing/under/under.dm
index f452628a1cb9..a48111690271 100644
--- a/code/modules/clothing/under/under.dm
+++ b/code/modules/clothing/under/under.dm
@@ -45,7 +45,7 @@
else
worn_state = icon_state
- var/check_icon = contained_sprite ? icon : default_onmob_icons[WEAR_BODY]
+ var/check_icon = contained_sprite ? icon : GLOB.default_onmob_icons[WEAR_BODY]
//autodetect rollability, cuttability, and removability.
if(icon_exists(check_icon, "[worn_state]_d[contained_sprite ? "_un" : ""]"))
@@ -259,7 +259,7 @@
else if(LAZYISIN(item_icons, WEAR_BODY))
under_icon = item_icons[WEAR_BODY]
else
- under_icon = default_onmob_icons[WEAR_BODY]
+ under_icon = GLOB.default_onmob_icons[WEAR_BODY]
var/check_worn_state = "[worn_state]_d[contained_sprite ? "_un" : ""]"
if(!(check_worn_state in icon_states(under_icon)))
@@ -292,7 +292,7 @@
else if(LAZYISIN(item_icons, WEAR_BODY))
under_icon = item_icons[WEAR_BODY]
else
- under_icon = default_onmob_icons[WEAR_BODY]
+ under_icon = GLOB.default_onmob_icons[WEAR_BODY]
var/check_worn_state = "[worn_state]_dj[contained_sprite ? "_un" : ""]"
if(!(check_worn_state in icon_states(under_icon)))
diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm
index 73ced8099427..068d0b032626 100644
--- a/code/modules/cm_aliens/XenoStructures.dm
+++ b/code/modules/cm_aliens/XenoStructures.dm
@@ -202,7 +202,7 @@
if (hive)
hivenumber = hive
set_hive_data(src, hivenumber)
- setDir(pick(alldirs))
+ setDir(pick(GLOB.alldirs))
if(hivenumber == XENO_HIVE_NORMAL)
RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling))
@@ -457,7 +457,7 @@
var/turf/U = loc
spawn(0)
var/turf/T
- for(var/i in cardinal)
+ for(var/i in GLOB.cardinals)
T = get_step(U, i)
if(!istype(T)) continue
for(var/obj/structure/mineral_door/resin/R in T)
@@ -490,7 +490,7 @@
//do we still have something next to us to support us?
/obj/structure/mineral_door/resin/proc/check_resin_support()
var/turf/T
- for(var/i in cardinal)
+ for(var/i in GLOB.cardinals)
T = get_step(src, i)
if(!T)
continue
@@ -934,9 +934,9 @@
// If the cell is the epicenter, propagate in all directions
if(isnull(direction))
- return alldirs
+ return GLOB.alldirs
- if(direction in cardinal)
+ if(direction in GLOB.cardinals)
. += list(direction, turn(direction, 45), turn(direction, -45))
else
. += direction
@@ -970,7 +970,7 @@
// Set the direction the explosion is traveling in
E.direction = dir
- if(dir in diagonals)
+ if(dir in GLOB.diagonals)
E.range--
switch(E.range)
diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm
index 1fd154eb354c..bcd0ecc03be5 100644
--- a/code/modules/cm_aliens/structures/special/egg_morpher.dm
+++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm
@@ -147,7 +147,7 @@
if(isitem(A))
var/obj/item/item = A
if(item.is_objective && item.unacidable)
- item.forceMove(get_step(loc, pick(alldirs)))
+ item.forceMove(get_step(loc, pick(GLOB.alldirs)))
item.mouse_opacity = initial(item.mouse_opacity)
QDEL_NULL(captured_mob)
diff --git a/code/modules/cm_aliens/structures/tunnel.dm b/code/modules/cm_aliens/structures/tunnel.dm
index f716d69b5b7e..9686b7253c00 100644
--- a/code/modules/cm_aliens/structures/tunnel.dm
+++ b/code/modules/cm_aliens/structures/tunnel.dm
@@ -29,7 +29,7 @@
/obj/structure/tunnel/Initialize(mapload, h_number)
. = ..()
var/turf/L = get_turf(src)
- tunnel_desc = L.loc.name + " ([loc.x], [loc.y]) [pick(greek_letters)]"//Default tunnel desc is the
(x, y)
+ tunnel_desc = L.loc.name + " ([loc.x], [loc.y]) [pick(GLOB.greek_letters)]"//Default tunnel desc is the (x, y)
if(h_number && GLOB.hive_datum[h_number])
hivenumber = h_number
diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm
index 736d4f947450..4be1ce63ac25 100644
--- a/code/modules/cm_aliens/weeds.dm
+++ b/code/modules/cm_aliens/weeds.dm
@@ -216,7 +216,7 @@
return
var/list/weeds = list()
- for(var/dirn in cardinal)
+ for(var/dirn in GLOB.cardinals)
var/turf/T = get_step(src, dirn)
if(!istype(T))
continue
@@ -282,7 +282,7 @@
if(istype(O, /obj/structure/barricade)) //cades on tile we're trying to expand to
var/obj/structure/barricade/to_blocking_cade = O
- if(to_blocking_cade.density && to_blocking_cade.dir == reverse_dir[direction] && to_blocking_cade.health >= (to_blocking_cade.maxhealth / 4))
+ if(to_blocking_cade.density && to_blocking_cade.dir == GLOB.reverse_dir[direction] && to_blocking_cade.health >= (to_blocking_cade.maxhealth / 4))
return FALSE
if(istype(O, /obj/structure/window/framed))
@@ -299,7 +299,7 @@
if(!U)
U = loc
if(istype(U))
- for(var/dirn in cardinal)
+ for(var/dirn in GLOB.cardinals)
var/turf/T = get_step(U, dirn)
if(!istype(T))
@@ -313,7 +313,7 @@
overlays.Cut()
var/my_dir = 0
- for(var/check_dir in cardinal)
+ for(var/check_dir in GLOB.cardinals)
var/turf/check = get_step(src, check_dir)
if(!istype(check))
diff --git a/code/modules/cm_marines/anti_air.dm b/code/modules/cm_marines/anti_air.dm
index 8c8cab302e19..e867c0d64083 100644
--- a/code/modules/cm_marines/anti_air.dm
+++ b/code/modules/cm_marines/anti_air.dm
@@ -1,4 +1,4 @@
-var/obj/structure/anti_air_cannon/almayer_aa_cannon
+GLOBAL_DATUM(almayer_aa_cannon, /obj/structure/anti_air_cannon)
/obj/structure/anti_air_cannon
name = "\improper IX-50 MGAD Cannon"
@@ -20,14 +20,14 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon
/obj/structure/anti_air_cannon/New()
. = ..()
- if(!almayer_aa_cannon)
- almayer_aa_cannon = src
+ if(!GLOB.almayer_aa_cannon)
+ GLOB.almayer_aa_cannon = src
/obj/structure/anti_air_cannon/Destroy()
. = ..()
- if(almayer_aa_cannon == src)
- almayer_aa_cannon = null
- message_admins("Reference to almayer_aa_cannon is lost!")
+ if(GLOB.almayer_aa_cannon == src)
+ GLOB.almayer_aa_cannon = null
+ message_admins("Reference to GLOB.almayer_aa_cannon is lost!")
/obj/structure/anti_air_cannon/ex_act()
return
@@ -79,7 +79,7 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon
data["sections"] = list()
- for(var/section in almayer_ship_sections)
+ for(var/section in GLOB.almayer_ship_sections)
data["sections"] += list(list(
"section_id" = section,
))
@@ -89,8 +89,8 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon
/obj/structure/machinery/computer/aa_console/ui_data(mob/user)
var/list/data = list()
- data["disabled"] = almayer_aa_cannon.is_disabled
- data["protecting_section"] = almayer_aa_cannon.protecting_section
+ data["disabled"] = GLOB.almayer_aa_cannon.is_disabled
+ data["protecting_section"] = GLOB.almayer_aa_cannon.protecting_section
return data
@@ -99,20 +99,20 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon
if(.)
return
- if(!almayer_aa_cannon)
+ if(!GLOB.almayer_aa_cannon)
return
switch(action)
if("protect")
- almayer_aa_cannon.protecting_section = params["section_id"]
- if(!(almayer_aa_cannon.protecting_section in almayer_ship_sections))
- almayer_aa_cannon.protecting_section = ""
+ GLOB.almayer_aa_cannon.protecting_section = params["section_id"]
+ if(!(GLOB.almayer_aa_cannon.protecting_section in GLOB.almayer_ship_sections))
+ GLOB.almayer_aa_cannon.protecting_section = ""
return
- message_admins("[key_name(usr)] has set the AA to [html_encode(almayer_aa_cannon.protecting_section)].")
- log_ares_antiair("[usr] Set AA to cover [html_encode(almayer_aa_cannon.protecting_section)].")
+ message_admins("[key_name(usr)] has set the AA to [html_encode(GLOB.almayer_aa_cannon.protecting_section)].")
+ log_ares_antiair("[usr] Set AA to cover [html_encode(GLOB.almayer_aa_cannon.protecting_section)].")
. = TRUE
if("deactivate")
- almayer_aa_cannon.protecting_section = ""
+ GLOB.almayer_aa_cannon.protecting_section = ""
message_admins("[key_name(usr)] has deactivated the AA cannon.")
log_ares_antiair("[usr] Deactivated Anti Air systems.")
. = TRUE
diff --git a/code/modules/cm_marines/codebook.dm b/code/modules/cm_marines/codebook.dm
index 11013f764538..64e74fba2c9a 100644
--- a/code/modules/cm_marines/codebook.dm
+++ b/code/modules/cm_marines/codebook.dm
@@ -11,10 +11,10 @@ GLOBAL_LIST_EMPTY(codebook_data)
var/letter
var/code_data = "| Call | Response | |
|---|
"
for(var/i in 1 to 10)
- letter = pick(greek_letters)
+ letter = pick(GLOB.greek_letters)
number = rand(100,999)
code_data += "| [letter]-[number] | "
- letter = pick(greek_letters)
+ letter = pick(GLOB.greek_letters)
number = rand(100,999)
code_data += "[letter]-[number] |
"
code_data += "
"
diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index ef59e643e4cf..53a22051299b 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -40,7 +40,7 @@
var/combat_equipment = TRUE
/obj/structure/ship_ammo/attack_alien(mob/living/carbon/xenomorph/current_xenomorph)
- if(unslashable)
+ if(unslashable)
return XENO_NO_DELAY_ACTION
current_xenomorph.animation_attack_on(src)
playsound(src, 'sound/effects/metalhit.ogg', 25, 1)
@@ -170,7 +170,7 @@
var/turf/impact_tile = pick(turf_list)
sleep(1)
var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob)
- impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(alldirs), cause_data)
+ impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data)
create_shrapnel(impact_tile,1,0,0,shrapnel_type,cause_data,FALSE,100) //simulates a bullet
for(var/atom/movable/explosion_effect in impact_tile)
if(iscarbon(explosion_effect))
diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm
index 851b91ea3e1a..b50198095aab 100644
--- a/code/modules/cm_marines/dropship_equipment.dm
+++ b/code/modules/cm_marines/dropship_equipment.dm
@@ -824,7 +824,7 @@
return
var/list/possible_stretchers = list()
- for(var/obj/structure/bed/medevac_stretcher/MS in activated_medevac_stretchers)
+ for(var/obj/structure/bed/medevac_stretcher/MS in GLOB.activated_medevac_stretchers)
var/area/AR = get_area(MS)
var/evaccee_name
var/evaccee_triagecard_color
@@ -1046,7 +1046,7 @@
return
var/list/possible_fultons = list()
- for(var/obj/item/stack/fulton/F in deployed_fultons)
+ for(var/obj/item/stack/fulton/F in GLOB.deployed_fultons)
var/recovery_object
if(F.attached_atom)
recovery_object = F.attached_atom.name
@@ -1148,7 +1148,7 @@
color = "#17d17a"
/obj/structure/dropship_equipment/rappel_system/attack_hand(mob/living/carbon/human/user)
- var/datum/cas_iff_group/cas_group = cas_groups[FACTION_MARINE]
+ var/datum/cas_iff_group/cas_group = GLOB.cas_groups[FACTION_MARINE]
var/list/targets = cas_group.cas_signals
if(!LAZYLEN(targets))
diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
index 4a7864dbe0f5..342f9a775718 100644
--- a/code/modules/cm_marines/equipment/kit_boxes.dm
+++ b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -213,13 +213,13 @@
return TRUE
/obj/item/spec_kit/proc/select_and_spawn(mob/living/carbon/human/user)
- var/selection = tgui_input_list(user, "Pick your specialist equipment type.", "Specialist Kit Selection", available_specialist_kit_boxes)
+ var/selection = tgui_input_list(user, "Pick your specialist equipment type.", "Specialist Kit Selection", GLOB.available_specialist_kit_boxes)
if(!selection || QDELETED(src))
return FALSE
if(!skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_TRAINED) && !skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL))
to_chat(user, SPAN_WARNING("You already unwrapped your [name], give this one to someone else!"))
return
- if(!available_specialist_kit_boxes[selection] || available_specialist_kit_boxes[selection] <= 0)
+ if(!GLOB.available_specialist_kit_boxes[selection] || GLOB.available_specialist_kit_boxes[selection] <= 0)
to_chat(user, SPAN_WARNING("No more kits of this type may be chosen!"))
return FALSE
var/obj/item/card/id/ID = user.wear_id
diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm
index a0943bb7f0a6..3cba4edd0a1d 100644
--- a/code/modules/cm_marines/m2c.dm
+++ b/code/modules/cm_marines/m2c.dm
@@ -557,7 +557,7 @@
animate(user, pixel_x=diff_x, pixel_y=diff_y, 0.4 SECONDS)
else
if(user.client)
- user.client.change_view(world_view_size)
+ user.client.change_view(GLOB.world_view_size)
user.client.pixel_x = 0
user.client.pixel_y = 0
diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm
index a3bea392c201..d05233e57937 100644
--- a/code/modules/cm_marines/marines_consoles.dm
+++ b/code/modules/cm_marines/marines_consoles.dm
@@ -199,7 +199,7 @@
if(is_centcom)
new_access = get_access(ACCESS_LIST_WY_ALL)
else
- var/datum/job/job = RoleAuthority.roles_for_mode[target]
+ var/datum/job/job = GLOB.RoleAuthority.roles_for_mode[target]
if(!job)
visible_message("[SPAN_BOLD("[src]")] states, \"DATA ERROR: Can not find next entry in database: [target]\"")
@@ -293,7 +293,7 @@
/obj/structure/machinery/computer/card/ui_static_data(mob/user)
var/list/data = list()
- data["station_name"] = station_name
+ data["station_name"] = MAIN_SHIP_NAME
data["centcom_access"] = is_centcom
data["manifest"] = GLOB.data_core.get_manifest(FALSE, FALSE, TRUE)
@@ -303,25 +303,25 @@
else if(Check_WO())
// I am not sure about WOs departments so it may need adjustment
departments = list(
- CARDCON_DEPARTMENT_COMMAND = ROLES_CIC & ROLES_WO,
- CARDCON_DEPARTMENT_AUXCOM = ROLES_AUXIL_SUPPORT & ROLES_WO,
- CARDCON_DEPARTMENT_MISC = ROLES_MISC & ROLES_WO,
- CARDCON_DEPARTMENT_SECURITY = ROLES_POLICE & ROLES_WO,
- CARDCON_DEPARTMENT_ENGINEERING = ROLES_ENGINEERING & ROLES_WO,
- CARDCON_DEPARTMENT_SUPPLY = ROLES_REQUISITION & ROLES_WO,
- CARDCON_DEPARTMENT_MEDICAL = ROLES_MEDICAL & ROLES_WO,
- CARDCON_DEPARTMENT_MARINE = ROLES_MARINES
+ CARDCON_DEPARTMENT_COMMAND = GLOB.ROLES_CIC & GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_AUXCOM = GLOB.ROLES_AUXIL_SUPPORT & GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_MISC = GLOB.ROLES_MISC & GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_SECURITY = GLOB.ROLES_POLICE & GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_ENGINEERING = GLOB.ROLES_ENGINEERING & GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_SUPPLY = GLOB.ROLES_REQUISITION & GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_MEDICAL = GLOB.ROLES_MEDICAL & GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_MARINE = GLOB.ROLES_MARINES
)
else
departments = list(
- CARDCON_DEPARTMENT_COMMAND = ROLES_CIC - ROLES_WO,
- CARDCON_DEPARTMENT_AUXCOM = ROLES_AUXIL_SUPPORT - ROLES_WO,
- CARDCON_DEPARTMENT_MISC = ROLES_MISC - ROLES_WO,
- CARDCON_DEPARTMENT_SECURITY = ROLES_POLICE - ROLES_WO,
- CARDCON_DEPARTMENT_ENGINEERING = ROLES_ENGINEERING - ROLES_WO,
- CARDCON_DEPARTMENT_SUPPLY = ROLES_REQUISITION - ROLES_WO,
- CARDCON_DEPARTMENT_MEDICAL = ROLES_MEDICAL - ROLES_WO,
- CARDCON_DEPARTMENT_MARINE = ROLES_MARINES
+ CARDCON_DEPARTMENT_COMMAND = GLOB.ROLES_CIC - GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_AUXCOM = GLOB.ROLES_AUXIL_SUPPORT - GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_MISC = GLOB.ROLES_MISC - GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_SECURITY = GLOB.ROLES_POLICE - GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_ENGINEERING = GLOB.ROLES_ENGINEERING - GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_SUPPLY = GLOB.ROLES_REQUISITION - GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_MEDICAL = GLOB.ROLES_MEDICAL - GLOB.ROLES_WO,
+ CARDCON_DEPARTMENT_MARINE = GLOB.ROLES_MARINES
)
data["jobs"] = list()
for(var/department in departments)
@@ -376,7 +376,7 @@
/obj/structure/machinery/computer/card/ui_data(mob/user)
var/list/data = list()
- data["station_name"] = station_name
+ data["station_name"] = MAIN_SHIP_NAME
data["authenticated"] = authenticated
data["has_id"] = !!target_id_card
@@ -560,7 +560,7 @@
var/datum/squad/selected = get_squad_by_name(params["name"])
if(!selected)
return
- if(RoleAuthority.check_squad_capacity(person_to_modify, selected))
+ if(GLOB.RoleAuthority.check_squad_capacity(person_to_modify, selected))
visible_message("[SPAN_BOLD("[src]")] states, \"CAPACITY ERROR: [selected] can't have another [person_to_modify.job].\"")
return TRUE
if(transfer_marine_to_squad(person_to_modify, selected, person_to_modify.assigned_squad, ID_to_modify))
@@ -594,7 +594,7 @@
/obj/structure/machinery/computer/squad_changer/ui_static_data(mob/user)
var/list/data = list()
var/list/squads = list()
- for(var/datum/squad/current_squad in RoleAuthority.squads)
+ for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads)
if(current_squad.name != "Root" && !current_squad.locked && current_squad.active && current_squad.faction == faction)
var/list/squad = list(list(
"name" = current_squad.name,
@@ -1005,7 +1005,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
RAIDER_SQUAD = 131,
)
var/squad_number = 70
- for(var/squad_name in ROLES_SQUAD_ALL + "")
+ for(var/squad_name in GLOB.ROLES_SQUAD_ALL + "")
if(!squad_name) squad_number = 120
else squad_name += " "
jobs += list(
diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm
index edcb5a836b5d..6fdd2cf3e61a 100644
--- a/code/modules/cm_marines/orbital_cannon.dm
+++ b/code/modules/cm_marines/orbital_cannon.dm
@@ -1,8 +1,8 @@
//global vars
-var/obj/structure/orbital_cannon/almayer_orbital_cannon
-var/list/ob_type_fuel_requirements
+GLOBAL_DATUM(almayer_orbital_cannon, /obj/structure/orbital_cannon)
+GLOBAL_LIST(ob_type_fuel_requirements)
/obj/structure/orbital_cannon
name = "\improper Orbital Cannon"
@@ -30,16 +30,16 @@ var/list/ob_type_fuel_requirements
/obj/structure/orbital_cannon/New()
..()
- if(!almayer_orbital_cannon)
- almayer_orbital_cannon = src
+ if(!GLOB.almayer_orbital_cannon)
+ GLOB.almayer_orbital_cannon = src
- if(!ob_type_fuel_requirements)
- ob_type_fuel_requirements = list()
+ if(!GLOB.ob_type_fuel_requirements)
+ GLOB.ob_type_fuel_requirements = list()
var/list/L = list(4,5,6)
var/amt
for(var/i=1 to 3)
amt = pick_n_take(L)
- ob_type_fuel_requirements += amt
+ GLOB.ob_type_fuel_requirements += amt
var/turf/T = locate(x+1,y+2,z)
var/obj/structure/orbital_tray/O = new(T)
@@ -48,9 +48,9 @@ var/list/ob_type_fuel_requirements
/obj/structure/orbital_cannon/Destroy()
QDEL_NULL(tray)
- if(almayer_orbital_cannon == src)
- almayer_orbital_cannon = null
- message_admins("Reference to almayer_orbital_cannon is lost!")
+ if(GLOB.almayer_orbital_cannon == src)
+ GLOB.almayer_orbital_cannon = null
+ message_admins("Reference to GLOB.almayer_orbital_cannon is lost!")
return ..()
/obj/structure/orbital_cannon/ex_act()
@@ -190,17 +190,16 @@ var/list/ob_type_fuel_requirements
update_icon()
-/var/global/list/orbital_cannon_cancellation = new
-
+GLOBAL_LIST_EMPTY(orbital_cannon_cancellation)
/obj/structure/orbital_cannon/proc/get_misfuel_amount()
switch(tray.warhead.warhead_kind)
if("explosive")
- return abs(ob_type_fuel_requirements[1] - tray.fuel_amt)
+ return abs(GLOB.ob_type_fuel_requirements[1] - tray.fuel_amt)
if("incendiary")
- return abs(ob_type_fuel_requirements[2] - tray.fuel_amt)
+ return abs(GLOB.ob_type_fuel_requirements[2] - tray.fuel_amt)
if("cluster")
- return abs(ob_type_fuel_requirements[3] - tray.fuel_amt)
+ return abs(GLOB.ob_type_fuel_requirements[3] - tray.fuel_amt)
return 0
/obj/structure/orbital_cannon/proc/fire_ob_cannon(turf/T, mob/user, squad_behalf)
@@ -389,7 +388,7 @@ var/list/ob_type_fuel_requirements
playsound(target, 'sound/weapons/gun_orbital_travel.ogg', 100, 1, 75)
var/cancellation_token = rand(0,32000)
- orbital_cannon_cancellation["[cancellation_token]"] = src
+ GLOB.orbital_cannon_cancellation["[cancellation_token]"] = src
message_admins(FONT_SIZE_XL("CLICK TO CANCEL THIS OB"))
var/relative_dir
@@ -422,9 +421,9 @@ var/list/ob_type_fuel_requirements
)
sleep(OB_TRAVEL_TIMING/3)
- if(orbital_cannon_cancellation["[cancellation_token]"]) // the cancelling notification is in the topic
+ if(GLOB.orbital_cannon_cancellation["[cancellation_token]"]) // the cancelling notification is in the topic
target.ceiling_debris_check(5)
- orbital_cannon_cancellation["[cancellation_token]"] = null
+ GLOB.orbital_cannon_cancellation["[cancellation_token]"] = null
return TRUE
return FALSE
@@ -627,33 +626,33 @@ var/list/ob_type_fuel_requirements
/obj/structure/machinery/computer/orbital_cannon_console/ui_static_data(mob/user)
var/list/data = list()
- data["hefuel"] = ob_type_fuel_requirements[1]
- data["incfuel"] = ob_type_fuel_requirements[2]
- data["clusterfuel"] = ob_type_fuel_requirements[3]
+ data["hefuel"] = GLOB.ob_type_fuel_requirements[1]
+ data["incfuel"] = GLOB.ob_type_fuel_requirements[2]
+ data["clusterfuel"] = GLOB.ob_type_fuel_requirements[3]
- data["linkedcannon"] = almayer_orbital_cannon
- data["linkedtray"] = almayer_orbital_cannon.tray
+ data["linkedcannon"] = GLOB.almayer_orbital_cannon
+ data["linkedtray"] = GLOB.almayer_orbital_cannon.tray
return data
/obj/structure/machinery/computer/orbital_cannon_console/ui_data(mob/user)
var/list/data = list()
- data["loadedtray"] = almayer_orbital_cannon.loaded_tray
- data["chamberedtray"] = almayer_orbital_cannon.chambered_tray
+ data["loadedtray"] = GLOB.almayer_orbital_cannon.loaded_tray
+ data["chamberedtray"] = GLOB.almayer_orbital_cannon.chambered_tray
var/warhead_name = null
- if(almayer_orbital_cannon.tray.warhead)
- warhead_name = almayer_orbital_cannon.tray.warhead.name
+ if(GLOB.almayer_orbital_cannon.tray.warhead)
+ warhead_name = GLOB.almayer_orbital_cannon.tray.warhead.name
data["warhead"] = warhead_name
- data["fuel"] = almayer_orbital_cannon.tray.fuel_amt
+ data["fuel"] = GLOB.almayer_orbital_cannon.tray.fuel_amt
data["worldtime"] = world.time
- data["nextchambertime"] = almayer_orbital_cannon.ob_chambering_cooldown
- data["chamber_cooldown"] = almayer_orbital_cannon.chamber_cooldown_time
+ data["nextchambertime"] = GLOB.almayer_orbital_cannon.ob_chambering_cooldown
+ data["chamber_cooldown"] = GLOB.almayer_orbital_cannon.chamber_cooldown_time
- data["disabled"] = almayer_orbital_cannon.is_disabled
+ data["disabled"] = GLOB.almayer_orbital_cannon.is_disabled
return data
@@ -664,15 +663,15 @@ var/list/ob_type_fuel_requirements
switch(action)
if("load_tray")
- almayer_orbital_cannon.load_tray(usr)
+ GLOB.almayer_orbital_cannon.load_tray(usr)
. = TRUE
if("unload_tray")
- almayer_orbital_cannon.unload_tray(usr)
+ GLOB.almayer_orbital_cannon.unload_tray(usr)
. = TRUE
if("chamber_tray")
- almayer_orbital_cannon.chamber_payload(usr)
+ GLOB.almayer_orbital_cannon.chamber_payload(usr)
. = TRUE
add_fingerprint(usr)
diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
index 6db426a348c3..6f571eeddaf1 100644
--- a/code/modules/cm_marines/overwatch.dm
+++ b/code/modules/cm_marines/overwatch.dm
@@ -112,7 +112,7 @@
if(!current_squad)
data["squad_list"] = list()
- for(var/datum/squad/current_squad in RoleAuthority.squads)
+ for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads)
if(current_squad.active && !current_squad.overwatch_officer && current_squad.faction == faction && current_squad.name != "Root")
data["squad_list"] += current_squad.name
return data
@@ -315,8 +315,8 @@
data["can_launch_crates"] = has_supply_pad
data["has_crate_loaded"] = supply_crate
data["supply_cooldown"] = COOLDOWN_TIMELEFT(current_squad, next_supplydrop)
- data["ob_cooldown"] = COOLDOWN_TIMELEFT(almayer_orbital_cannon, ob_firing_cooldown)
- data["ob_loaded"] = almayer_orbital_cannon.chambered_tray
+ data["ob_cooldown"] = COOLDOWN_TIMELEFT(GLOB.almayer_orbital_cannon, ob_firing_cooldown)
+ data["ob_loaded"] = GLOB.almayer_orbital_cannon.chambered_tray
data["operator"] = operator.name
@@ -340,7 +340,7 @@
if(current_squad)
return
var/datum/squad/selected_squad
- for(var/datum/squad/searching_squad in RoleAuthority.squads)
+ for(var/datum/squad/searching_squad in GLOB.RoleAuthority.squads)
if(searching_squad.active && !searching_squad.overwatch_officer && searching_squad.faction == faction && searching_squad.name != "Root" && searching_squad.name == params["squad"])
selected_squad = searching_squad
break
@@ -453,10 +453,10 @@
return
x_bomb = text2num(params["x"])
y_bomb = text2num(params["y"])
- if(almayer_orbital_cannon.is_disabled)
+ if(GLOB.almayer_orbital_cannon.is_disabled)
to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon disabled!")]")
- else if(!COOLDOWN_FINISHED(almayer_orbital_cannon, ob_firing_cooldown))
- to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon not yet ready to fire again! Please wait [COOLDOWN_TIMELEFT(almayer_orbital_cannon, ob_firing_cooldown)/10] seconds.")]")
+ else if(!COOLDOWN_FINISHED(GLOB.almayer_orbital_cannon, ob_firing_cooldown))
+ to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon not yet ready to fire again! Please wait [COOLDOWN_TIMELEFT(GLOB.almayer_orbital_cannon, ob_firing_cooldown)/10] seconds.")]")
else
handle_bombard(user)
@@ -503,7 +503,7 @@
user.UnregisterSignal(cam, COMSIG_PARENT_QDELETING)
cam = null
user.reset_view(null)
- else if(user.client.view != world_view_size)
+ else if(user.client.view != GLOB.world_view_size)
to_chat(user, SPAN_WARNING("You're too busy peering through binoculars."))
else
if(cam)
@@ -628,9 +628,9 @@
var/area/ob_area = get_area(target)
if(!ob_area)
return
- var/ob_type = almayer_orbital_cannon.tray.warhead ? almayer_orbital_cannon.tray.warhead.warhead_kind : "UNKNOWN"
+ var/ob_type = GLOB.almayer_orbital_cannon.tray.warhead ? GLOB.almayer_orbital_cannon.tray.warhead.warhead_kind : "UNKNOWN"
- for(var/datum/squad/S in RoleAuthority.squads)
+ for(var/datum/squad/S in GLOB.RoleAuthority.squads)
if(!S.active)
continue
for(var/mob/living/carbon/human/M in S.marines_list)
@@ -697,7 +697,7 @@
return
var/list/available_squads = list()
- for(var/datum/squad/squad as anything in RoleAuthority.squads)
+ for(var/datum/squad/squad as anything in GLOB.RoleAuthority.squads)
if(squad.active && !squad.locked && squad.faction == faction && squad.name != "Root")
available_squads += squad
@@ -718,7 +718,7 @@
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("[transfer_marine] is already in [new_squad]!")]")
return
- if(RoleAuthority.check_squad_capacity(transfer_marine, new_squad))
+ if(GLOB.RoleAuthority.check_squad_capacity(transfer_marine, new_squad))
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Transfer aborted. [new_squad] can't have another [transfer_marine.job].")]")
return
@@ -741,7 +741,7 @@
to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("No squad selected!")]")
return
- if(!almayer_orbital_cannon.chambered_tray)
+ if(!GLOB.almayer_orbital_cannon.chambered_tray)
to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("The orbital cannon has no ammo chambered.")]")
return
@@ -791,8 +791,8 @@
if(!T)
return
- var/ob_name = lowertext(almayer_orbital_cannon.tray.warhead.name)
- var/mutable_appearance/warhead_appearance = mutable_appearance(almayer_orbital_cannon.tray.warhead.icon, almayer_orbital_cannon.tray.warhead.icon_state)
+ var/ob_name = lowertext(GLOB.almayer_orbital_cannon.tray.warhead.name)
+ var/mutable_appearance/warhead_appearance = mutable_appearance(GLOB.almayer_orbital_cannon.tray.warhead.icon, GLOB.almayer_orbital_cannon.tray.warhead.icon_state)
notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [get_area(T)] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE)
/// Project ARES interface log.
@@ -800,7 +800,7 @@
busy = FALSE
if(istype(T))
- almayer_orbital_cannon.fire_ob_cannon(T, user, current_squad)
+ GLOB.almayer_orbital_cannon.fire_ob_cannon(T, user, current_squad)
user.count_niche_stat(STATISTICS_NICHE_OB)
/obj/structure/machinery/computer/overwatch/proc/handle_supplydrop()
diff --git a/code/modules/cm_marines/shuttle_backend.dm b/code/modules/cm_marines/shuttle_backend.dm
index 3de169d773e5..1bd96289e434 100644
--- a/code/modules/cm_marines/shuttle_backend.dm
+++ b/code/modules/cm_marines/shuttle_backend.dm
@@ -87,10 +87,10 @@ DOCUMENTATION ON HOW TO ADD A NEW SHUTTLE: Fourkhan, 6/7/19
*/
-var/global/list/s_info = null
+GLOBAL_LIST(s_info)
/proc/loadShuttleInfoDatums()
- s_info = list()
+ GLOB.s_info = list()
return 1
diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm
index b450f5f02841..db584308e5c2 100644
--- a/code/modules/cm_marines/smartgun_mount.dm
+++ b/code/modules/cm_marines/smartgun_mount.dm
@@ -910,7 +910,7 @@
animate(user, pixel_x=diff_x, pixel_y=diff_y, 0.4 SECONDS)
else
if(user.client)
- user.client.change_view(world_view_size)
+ user.client.change_view(GLOB.world_view_size)
user.client.pixel_x = 0
user.client.pixel_y = 0
animate(user, pixel_x=user_old_x, pixel_y=user_old_y, 4, 1)
diff --git a/code/modules/cm_marines/vehicle_part_fabricator.dm b/code/modules/cm_marines/vehicle_part_fabricator.dm
index ca53d368bbd6..0095ff54a2ab 100644
--- a/code/modules/cm_marines/vehicle_part_fabricator.dm
+++ b/code/modules/cm_marines/vehicle_part_fabricator.dm
@@ -123,13 +123,13 @@
unacidable = TRUE
/obj/structure/machinery/part_fabricator/dropship/get_point_store()
- return supply_controller.dropship_points
+ return GLOB.supply_controller.dropship_points
/obj/structure/machinery/part_fabricator/dropship/add_to_point_store(number = 1)
- supply_controller.dropship_points += number
+ GLOB.supply_controller.dropship_points += number
/obj/structure/machinery/part_fabricator/dropship/spend_point_store(number = 1)
- supply_controller.dropship_points -= number
+ GLOB.supply_controller.dropship_points -= number
/obj/structure/machinery/part_fabricator/dropship/ui_static_data(mob/user)
var/list/static_data = list()
@@ -230,13 +230,13 @@
indestructible = TRUE
/obj/structure/machinery/part_fabricator/tank/get_point_store()
- return supply_controller.tank_points
+ return GLOB.supply_controller.tank_points
/obj/structure/machinery/part_fabricator/tank/add_to_point_store(number = 1)
- supply_controller.tank_points += number
+ GLOB.supply_controller.tank_points += number
/obj/structure/machinery/part_fabricator/tank/spend_point_store(number = 1)
- supply_controller.tank_points -= number
+ GLOB.supply_controller.tank_points -= number
/obj/structure/machinery/part_fabricator/tank/ui_static_data(mob/user)
var/list/static_data = list()
diff --git a/code/modules/cm_preds/falcon.dm b/code/modules/cm_preds/falcon.dm
index 63c7e72ab670..dc898a2b76ba 100644
--- a/code/modules/cm_preds/falcon.dm
+++ b/code/modules/cm_preds/falcon.dm
@@ -85,11 +85,11 @@
PF.flags_can_pass_all = PASS_ALL
/mob/hologram/falcon/add_to_all_mob_huds()
- var/datum/mob_hud/hud = huds[MOB_HUD_HUNTER]
+ var/datum/mob_hud/hud = GLOB.huds[MOB_HUD_HUNTER]
hud.add_to_hud(src)
/mob/hologram/falcon/remove_from_all_mob_huds()
- var/datum/mob_hud/hud = huds[MOB_HUD_HUNTER]
+ var/datum/mob_hud/hud = GLOB.huds[MOB_HUD_HUNTER]
hud.remove_from_hud(src)
/mob/hologram/falcon/med_hud_set_status()
diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm
index 7173575710b1..ecfd1cfbad8e 100644
--- a/code/modules/cm_preds/yaut_bracers.dm
+++ b/code/modules/cm_preds/yaut_bracers.dm
@@ -590,9 +590,9 @@
playsound(M.loc,'sound/effects/pred_cloakon.ogg', 15, 1)
animate(M, alpha = new_alpha, time = 1.5 SECONDS, easing = SINE_EASING|EASE_OUT)
- var/datum/mob_hud/security/advanced/SA = huds[MOB_HUD_SECURITY_ADVANCED]
+ var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
SA.remove_from_hud(M)
- var/datum/mob_hud/xeno_infection/XI = huds[MOB_HUD_XENO_INFECTION]
+ var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION]
XI.remove_from_hud(M)
anim(M.loc,M,'icons/mob/mob.dmi',,"cloak",,M.dir)
@@ -632,9 +632,9 @@
user.see_invisible = initial(user.see_invisible)
cloak_timer = world.time + (DECLOAK_STANDARD / 2)
- var/datum/mob_hud/security/advanced/SA = huds[MOB_HUD_SECURITY_ADVANCED]
+ var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
SA.add_to_hud(user)
- var/datum/mob_hud/xeno_infection/XI = huds[MOB_HUD_XENO_INFECTION]
+ var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION]
XI.add_to_hud(user)
anim(user.loc, user, 'icons/mob/mob.dmi', null, "uncloak", null, user.dir)
diff --git a/code/modules/cm_preds/yaut_mask.dm b/code/modules/cm_preds/yaut_mask.dm
index ae27809a3ec7..7e8e661e8a5e 100644
--- a/code/modules/cm_preds/yaut_mask.dm
+++ b/code/modules/cm_preds/yaut_mask.dm
@@ -172,7 +172,7 @@
STOP_PROCESSING(SSobj, src)
if(istype(user) && user.wear_mask == src) //inventory reference is only cleared after dropped().
for(var/listed_hud in mask_huds)
- var/datum/mob_hud/H = huds[listed_hud]
+ var/datum/mob_hud/H = GLOB.huds[listed_hud]
H.remove_hud_from(user, src)
var/obj/item/visor = user.glasses
if(visor) //make your hud fuck off
@@ -187,7 +187,7 @@
if(slot == WEAR_FACE)
START_PROCESSING(SSobj, src)
for(var/listed_hud in mask_huds)
- var/datum/mob_hud/H = huds[listed_hud]
+ var/datum/mob_hud/H = GLOB.huds[listed_hud]
H.add_hud_to(user, src)
if(current_goggles)
var/obj/item/clothing/gloves/yautja/bracer = user.gloves
diff --git a/code/modules/cm_tech/droppod/gear_access_point.dm b/code/modules/cm_tech/droppod/gear_access_point.dm
index b581764e2d3b..608fd33e18f4 100644
--- a/code/modules/cm_tech/droppod/gear_access_point.dm
+++ b/code/modules/cm_tech/droppod/gear_access_point.dm
@@ -43,9 +43,9 @@
return
/obj/structure/techpod_vendor/proc/get_access_permission(mob/living/carbon/human/user)
- if(SSticker.mode == GAMEMODE_WHISKEY_OUTPOST || master_mode == GAMEMODE_WHISKEY_OUTPOST) //all WO has lifted access restrictions
+ if(SSticker.mode == GAMEMODE_WHISKEY_OUTPOST || GLOB.master_mode == GAMEMODE_WHISKEY_OUTPOST) //all WO has lifted access restrictions
return TRUE
- else if(SSticker.mode == "Distress Signal" || master_mode == "Distress Signal")
+ else if(SSticker.mode == "Distress Signal" || GLOB.master_mode == "Distress Signal")
if(access_settings_override) //everyone allowed to grab stuff
return TRUE
else if(user.get_target_lock(faction_requirement)) //only it's faction group allowed
diff --git a/code/modules/cm_tech/implements/stims.dm b/code/modules/cm_tech/implements/stims.dm
index 7b0f74457a7f..f7307e2ef99b 100644
--- a/code/modules/cm_tech/implements/stims.dm
+++ b/code/modules/cm_tech/implements/stims.dm
@@ -47,7 +47,7 @@
return
icon_state = "stimpack"
- var/datum/reagent/R = chemical_reagents_list[chemname]
+ var/datum/reagent/R = GLOB.chemical_reagents_list[chemname]
if(!R)
return
diff --git a/code/modules/cm_tech/implements/tank.dm b/code/modules/cm_tech/implements/tank.dm
index 1ce83c37eae3..1e6b3d656330 100644
--- a/code/modules/cm_tech/implements/tank.dm
+++ b/code/modules/cm_tech/implements/tank.dm
@@ -36,8 +36,8 @@
/obj/item/tank_coupon/proc/redeem_tank(mob/user)
SHOULD_NOT_SLEEP(TRUE)
. = FALSE
- var/obj/structure/machinery/computer/supplycomp/vehicle/comp = VehicleElevatorConsole
- var/obj/structure/machinery/cm_vending/gear/vehicle_crew/gearcomp = VehicleGearConsole
+ var/obj/structure/machinery/computer/supplycomp/vehicle/comp = GLOB.VehicleElevatorConsole
+ var/obj/structure/machinery/cm_vending/gear/vehicle_crew/gearcomp = GLOB.VehicleGearConsole
if(!comp || !gearcomp)
return
@@ -62,11 +62,11 @@
var/datum/supply_packs/VK = /datum/supply_packs/vc_kit
var/pack = initial(VK.name)
var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_controller.ordernum
- supply_controller.ordernum++
- O.object = supply_controller.supply_packs[pack]
+ O.ordernum = GLOB.supply_controller.ordernum
+ GLOB.supply_controller.ordernum++
+ O.object = GLOB.supply_controller.supply_packs[pack]
O.orderedby = MAIN_AI_SYSTEM
O.approvedby = MAIN_AI_SYSTEM
- supply_controller.shoppinglist += O
+ GLOB.supply_controller.shoppinglist += O
return TRUE
diff --git a/code/modules/cm_tech/research_memories.dm b/code/modules/cm_tech/research_memories.dm
index d46a52b8b47a..4d84a762c719 100644
--- a/code/modules/cm_tech/research_memories.dm
+++ b/code/modules/cm_tech/research_memories.dm
@@ -14,8 +14,8 @@
clue_category["name"] = "Analyze Chemicals"
clue_category["icon"] = "scroll"
clue_category["clues"] = list()
- for (var/chemid in chemical_data.chemical_not_completed_objective_list)
- clue_category["clues"] += list(chemical_data.get_tgui_data(chemid))
+ for (var/chemid in GLOB.chemical_data.chemical_not_completed_objective_list)
+ clue_category["clues"] += list(GLOB.chemical_data.get_tgui_data(chemid))
clue_categories += list(clue_category)
return clue_categories
@@ -51,7 +51,7 @@
"Analyze Chemicals",
SSobjectives.statistics["chemicals_completed"],
FALSE,
- chemical_data.rsc_credits,
+ GLOB.chemical_data.rsc_credits,
"white"
))
@@ -60,9 +60,9 @@
/datum/research_objective_memory_interface/ui_data(mob/user)
. = list()
- .["research_credits"] = chemical_data.rsc_credits
- var/clearance = "[chemical_data.clearance_level]"
- if(chemical_data.clearance_x_access)
+ .["research_credits"] = GLOB.chemical_data.rsc_credits
+ var/clearance = "[GLOB.chemical_data.clearance_level]"
+ if(GLOB.chemical_data.clearance_x_access)
clearance +="X"
.["clearance"] = clearance
.["objectives"] = get_objectives(user)
diff --git a/code/modules/cm_tech/techs/marine/tier1/points.dm b/code/modules/cm_tech/techs/marine/tier1/points.dm
index 739b82fa1504..d6bb5bace6fc 100644
--- a/code/modules/cm_tech/techs/marine/tier1/points.dm
+++ b/code/modules/cm_tech/techs/marine/tier1/points.dm
@@ -24,7 +24,7 @@
/datum/tech/repeatable/req_points/on_unlock()
. = ..()
- supply_controller.points += points_to_give * get_tech_scaling_value()
+ GLOB.supply_controller.points += points_to_give * get_tech_scaling_value()
/datum/tech/repeatable/dropship_points
name = "Dropship Budget Increase"
@@ -44,4 +44,4 @@
/datum/tech/repeatable/dropship_points/on_unlock()
. = ..()
- supply_controller.dropship_points += points_to_give
+ GLOB.supply_controller.dropship_points += points_to_give
diff --git a/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm b/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm
index 2ab2c2541e68..d4f2ce6fc0ef 100644
--- a/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm
+++ b/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm
@@ -17,12 +17,12 @@
return
var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_controller.ordernum
- supply_controller.ordernum++
- O.object = supply_controller.supply_packs[type_to_give]
+ O.ordernum = GLOB.supply_controller.ordernum
+ GLOB.supply_controller.ordernum++
+ O.object = GLOB.supply_controller.supply_packs[type_to_give]
O.orderedby = MAIN_AI_SYSTEM
- supply_controller.shoppinglist += O
+ GLOB.supply_controller.shoppinglist += O
/datum/tech/repeatable/ob/he
name = "Additional OB projectiles - HE"
diff --git a/code/modules/cm_tech/techs/marine/tier4/nuke.dm b/code/modules/cm_tech/techs/marine/tier4/nuke.dm
index f970f37a3fab..e4e33de89966 100644
--- a/code/modules/cm_tech/techs/marine/tier4/nuke.dm
+++ b/code/modules/cm_tech/techs/marine/tier4/nuke.dm
@@ -21,13 +21,13 @@
. = ..()
var/datum/supply_order/new_order = new()
- new_order.ordernum = supply_controller.ordernum
- supply_controller.ordernum++
- new_order.object = supply_controller.supply_packs["Encrypted Operational Nuke"]
+ new_order.ordernum = GLOB.supply_controller.ordernum
+ GLOB.supply_controller.ordernum++
+ new_order.object = GLOB.supply_controller.supply_packs["Encrypted Operational Nuke"]
new_order.orderedby = MAIN_AI_SYSTEM
new_order.approvedby = MAIN_AI_SYSTEM
- supply_controller.shoppinglist += new_order
+ GLOB.supply_controller.shoppinglist += new_order
/datum/tech/nuke/can_unlock(mob/unlocking_mob)
. = ..()
diff --git a/code/modules/cm_tech/trees/marine.dm b/code/modules/cm_tech/trees/marine.dm
index 8a805647e060..55e82882b848 100644
--- a/code/modules/cm_tech/trees/marine.dm
+++ b/code/modules/cm_tech/trees/marine.dm
@@ -161,7 +161,7 @@ GLOBAL_LIST_EMPTY(tech_controls_marine)
if(!powered())
to_chat(user, SPAN_WARNING("This computer has no power!"))
return FALSE
- if(!intel_system)
+ if(!GLOB.intel_system)
to_chat(user, SPAN_WARNING("The computer doesn't seem to be connected to anything..."))
return FALSE
if(user.action_busy)
diff --git a/code/modules/desert_dam/filtration/consoles.dm b/code/modules/desert_dam/filtration/consoles.dm
index 8c2814fafde7..277b2485ed23 100644
--- a/code/modules/desert_dam/filtration/consoles.dm
+++ b/code/modules/desert_dam/filtration/consoles.dm
@@ -1,4 +1,4 @@
-var/global/river_activated = FALSE
+GLOBAL_VAR_INIT(river_activated, FALSE)
/obj/structure/machinery/filtration/console
name = "console"
@@ -62,7 +62,7 @@ var/global/river_activated = FALSE
/obj/structure/machinery/filtration/console/ui_data(mob/user)
var/list/data = list()
- data["filt_on"] = river_activated
+ data["filt_on"] = GLOB.river_activated
return data
@@ -73,7 +73,7 @@ var/global/river_activated = FALSE
switch(action)
if("activate_filt")
- river_activated = TRUE
+ GLOB.river_activated = TRUE
/obj/structure/machinery/filtration/console/attack_hand(mob/user)
. = ..()
diff --git a/code/modules/desert_dam/filtration/filtration.dm b/code/modules/desert_dam/filtration/filtration.dm
index 6c079f3dcd60..33c3e265e182 100644
--- a/code/modules/desert_dam/filtration/filtration.dm
+++ b/code/modules/desert_dam/filtration/filtration.dm
@@ -47,18 +47,6 @@ Global river status var, maybe
Each var depends on others
-var/global/riverend_west = 0
-var/global/riverend_north = 0
-var/global/river_central = 0
-var/global/cannal = 0
-var/global/dam_underpass = 0
-var/global/south_river = 0
-var/global/south_filtration = 0
-var/global/east_river = 0
-var/global/east_filtration = 0
-var/global/south_riverstart = 0
-var/global/east_riverstart = 0
-
/proc/filtration_check()
if(east_filtration)
@@ -219,7 +207,7 @@ var/global/east_riverstart = 0
if(dispersing || !toxic)
return
- for(var/direction in alldirs)
+ for(var/direction in GLOB.alldirs)
if(direction == from_dir) continue //doesn't check backwards
var/effective_spread_delay
@@ -303,7 +291,7 @@ var/global/east_riverstart = 0
//var/area/A = get_area(src)
//A.ambience_exterior = 'sound/ambience/ambiatm1.ogg'
- for(var/obj/structure/machinery/dispersal_initiator/M in machines)
+ for(var/obj/structure/machinery/dispersal_initiator/M in GLOB.machines)
if (M.id == src.id)
M.initiate()
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 2e9142dcef91..a1cbce7a40a6 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -37,7 +37,7 @@ log transactions
/obj/structure/machinery/atm/New()
..()
- machine_id = "[station_name] RT #[num_financial_terminals++]"
+ machine_id = "[MAIN_SHIP_NAME] RT #[GLOB.num_financial_terminals++]"
spark_system = new /datum/effect_system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -79,7 +79,7 @@ log transactions
T.purpose = "Credit deposit"
T.amount = I:worth
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
@@ -212,7 +212,7 @@ log transactions
T.target_name = "Account #[target_account_number]"
T.purpose = transfer_purpose
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
T.amount = "([transfer_amount])"
authenticated_account.transaction_log.Add(T)
@@ -254,7 +254,7 @@ log transactions
T.target_name = failed_account.owner_name
T.purpose = "Unauthorised login attempt"
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
failed_account.transaction_log.Add(T)
else
@@ -275,7 +275,7 @@ log transactions
T.target_name = authenticated_account.owner_name
T.purpose = "Remote terminal access"
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
@@ -307,7 +307,7 @@ log transactions
T.purpose = "Credit withdrawal"
T.amount = "([amount])"
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
withdrawal_timer = world.time + 20
@@ -338,7 +338,7 @@ log transactions
T.purpose = "Credit withdrawal"
T.amount = "([amount])"
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
withdrawal_timer = world.time + 20
@@ -353,7 +353,7 @@ log transactions
R.info += "Account holder: [authenticated_account.owner_name]
"
R.info += "Account number: [authenticated_account.account_number]
"
R.info += "Balance: $[authenticated_account.money]
"
- R.info += "Date and time: [worldtime2text()], [current_date_string]
"
+ R.info += "Date and time: [worldtime2text()], [GLOB.current_date_string]
"
R.info += "Service terminal ID: [machine_id]
"
//stamp the paper
@@ -376,7 +376,7 @@ log transactions
R.info = "Transaction logs
"
R.info += "Account holder: [authenticated_account.owner_name]
"
R.info += "Account number: [authenticated_account.account_number]
"
- R.info += "Date and time: [worldtime2text()], [current_date_string]
"
+ R.info += "Date and time: [worldtime2text()], [GLOB.current_date_string]
"
R.info += "Service terminal ID: [machine_id]
"
R.info += ""
R.info += ""
@@ -443,7 +443,7 @@ log transactions
T.target_name = authenticated_account.owner_name
T.purpose = "Remote terminal access"
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 7e5bf22041a0..0a5a0b8f3cc8 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -32,7 +32,7 @@
T.purpose = "Account creation"
T.amount = starting_funds * id_paygrade.pay_multiplier
//set a random date, time and location some time over the past few decades
- T.date = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [game_year - rand(0, 10)]"
+ T.date = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [GLOB.game_year - rand(0, 10)]"
T.time = "[rand(0,24)]:[rand(11,59)]"
T.source_terminal = "Weyland-Yutani Terminal #[rand(111,1111)]"
for(var/attempt in 1 to 100) // Make up to 100 attempts to get a unique account number
@@ -41,12 +41,12 @@
break // Account number is unique!
//add the account
M.transaction_log.Add(T)
- all_money_accounts.Add(M)
+ GLOB.all_money_accounts.Add(M)
return M
/proc/charge_to_account(attempt_account_number, source_name, purpose, terminal_id, amount)
- for(var/datum/money_account/D in all_money_accounts)
+ for(var/datum/money_account/D in GLOB.all_money_accounts)
if(D.account_number == attempt_account_number && !D.suspended)
D.money += amount
@@ -58,7 +58,7 @@
T.amount = "([amount])"
else
T.amount = "[amount]"
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
T.source_terminal = terminal_id
D.transaction_log.Add(T)
@@ -70,13 +70,13 @@
//this returns the first account datum that matches the supplied accnum/pin combination, it returns null if the combination did not match any account
/proc/attempt_account_access(attempt_account_number, attempt_pin_number, security_level_passed = 0)
- for(var/datum/money_account/D in all_money_accounts)
+ for(var/datum/money_account/D in GLOB.all_money_accounts)
if(D.account_number == attempt_account_number)
if( D.security_level <= security_level_passed && (!D.security_level || D.remote_access_pin == attempt_pin_number) )
return D
break
/proc/get_account(account_number)
- for(var/datum/money_account/D in all_money_accounts)
+ for(var/datum/money_account/D in GLOB.all_money_accounts)
if(D.account_number == account_number)
return D
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index a5b36fd0bf3e..ca73c2efb84f 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -13,7 +13,7 @@
/obj/item/device/eftpos/Initialize()
. = ..()
- machine_id = "[station_name] EFTPOS #[num_financial_terminals++]"
+ machine_id = "[MAIN_SHIP_NAME] EFTPOS #[GLOB.num_financial_terminals++]"
access_code = rand(1111,111111)
spawn(0)
print_reference()
@@ -59,7 +59,7 @@
//by default, connect to the station account
//the user of the EFTPOS device can change the target account though, and no-one will be the wiser (except whoever's being charged)
- linked_account = station_account
+ linked_account = GLOB.station_account
/obj/item/device/eftpos/proc/print_reference()
var/obj/item/paper/R = new(src.loc)
@@ -136,7 +136,7 @@
T.purpose = (transaction_purpose ? transaction_purpose : "None supplied.")
T.amount = transaction_amount
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
linked_account.transaction_log.Add(T)
else
@@ -257,7 +257,7 @@
else
T.amount = "[transaction_amount]"
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
D.transaction_log.Add(T)
//
@@ -266,7 +266,7 @@
T.purpose = transaction_purpose
T.amount = "[transaction_amount]"
T.source_terminal = machine_id
- T.date = current_date_string
+ T.date = GLOB.current_date_string
T.time = worldtime2text()
linked_account.transaction_log.Add(T)
else
diff --git a/code/modules/economy/TradeDestinations.dm b/code/modules/economy/TradeDestinations.dm
index ff01dc89d242..94ead45bf13e 100644
--- a/code/modules/economy/TradeDestinations.dm
+++ b/code/modules/economy/TradeDestinations.dm
@@ -1,6 +1,6 @@
-var/list/weighted_randomevent_locations = list()
-var/list/weighted_mundaneevent_locations = list()
+GLOBAL_LIST_EMPTY(weighted_randomevent_locations)
+GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
/datum/trade_destination
var/name = ""
diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm
index 75a10a8ee199..a5f061e1a727 100644
--- a/code/modules/economy/economy_misc.dm
+++ b/code/modules/economy/economy_misc.dm
@@ -62,17 +62,17 @@
//Destroyers are medium sized vessels, often used for escorting larger ships but able to go toe-to-toe with them if need be.
//Frigates are medium sized vessels, often used for escorting larger ships. They will rapidly find themselves outclassed if forced to face heavy warships head on.
-var/global/current_date_string
+GLOBAL_VAR(current_date_string)
-var/global/datum/money_account/vendor_account
-var/global/datum/money_account/station_account
-var/global/list/datum/money_account/department_accounts = list()
-var/global/num_financial_terminals = 1
-var/global/list/all_money_accounts = list()
-var/global/economy_init = 0
+GLOBAL_DATUM(vendor_account, /datum/money_account)
+GLOBAL_DATUM(station_account, /datum/money_account)
+GLOBAL_LIST_INIT_TYPED(department_accounts, /datum/money_account, list())
+GLOBAL_VAR_INIT(num_financial_terminals, 1)
+GLOBAL_LIST_EMPTY(all_money_accounts)
+GLOBAL_VAR_INIT(economy_init, FALSE)
/proc/setup_economy()
- if(economy_init)
+ if(GLOB.economy_init)
return 2
var/datum/feed_channel/newChannel = new /datum/feed_channel
@@ -80,48 +80,48 @@ var/global/economy_init = 0
newChannel.author = "Automated Announcement Listing"
newChannel.locked = 1
newChannel.is_admin_channel = 1
- news_network.network_channels += newChannel
+ GLOB.news_network.network_channels += newChannel
newChannel = new /datum/feed_channel
newChannel.channel_name = "Nyx Daily"
newChannel.author = "CentComm Minister of Information"
newChannel.locked = 1
newChannel.is_admin_channel = 1
- news_network.network_channels += newChannel
+ GLOB.news_network.network_channels += newChannel
newChannel = new /datum/feed_channel
newChannel.channel_name = "The Gibson Gazette"
newChannel.author = "Editor Mike Hammers"
newChannel.locked = 1
newChannel.is_admin_channel = 1
- news_network.network_channels += newChannel
+ GLOB.news_network.network_channels += newChannel
for(var/loc_type in typesof(/datum/trade_destination) - /datum/trade_destination)
var/datum/trade_destination/D = new loc_type
- weighted_randomevent_locations[D] = D.viable_random_events.len
- weighted_mundaneevent_locations[D] = D.viable_mundane_events.len
+ GLOB.weighted_randomevent_locations[D] = D.viable_random_events.len
+ GLOB.weighted_mundaneevent_locations[D] = D.viable_mundane_events.len
create_station_account()
create_department_account("Vendor")
- vendor_account = department_accounts["Vendor"]
+ GLOB.vendor_account = GLOB.department_accounts["Vendor"]
- current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [game_year]"
+ GLOB.current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [GLOB.game_year]"
- economy_init = 1
+ GLOB.economy_init = TRUE
return 1
/proc/create_station_account()
- if(!station_account)
- station_account = new()
- station_account.owner_name = "[station_name] Station Account"
- station_account.account_number = rand(111111, 999999)
- station_account.remote_access_pin = rand(1111, 111111)
- station_account.money = 75000
+ if(!GLOB.station_account)
+ GLOB.station_account = new()
+ GLOB.station_account.owner_name = "[MAIN_SHIP_NAME] Station Account"
+ GLOB.station_account.account_number = rand(111111, 999999)
+ GLOB.station_account.remote_access_pin = rand(1111, 111111)
+ GLOB.station_account.money = 75000
//create an entry in the account transaction log for when it was created
var/datum/transaction/T = new()
- T.target_name = station_account.owner_name
+ T.target_name = GLOB.station_account.owner_name
T.purpose = "Account creation"
T.amount = 75000
T.date = "2nd April, 2555"
@@ -129,8 +129,8 @@ var/global/economy_init = 0
T.source_terminal = "Biesel GalaxyNet Terminal #277"
//add the account
- station_account.transaction_log.Add(T)
- all_money_accounts.Add(station_account)
+ GLOB.station_account.transaction_log.Add(T)
+ GLOB.all_money_accounts.Add(GLOB.station_account)
/proc/create_department_account(department)
var/datum/money_account/department_account = new()
@@ -150,6 +150,6 @@ var/global/economy_init = 0
//add the account
department_account.transaction_log.Add(T)
- all_money_accounts.Add(department_account)
+ GLOB.all_money_accounts.Add(department_account)
- department_accounts[department] = department_account
+ GLOB.department_accounts[department] = department_account
diff --git a/code/modules/events/comms_blackout.dm b/code/modules/events/comms_blackout.dm
index 76a871205067..ea7ad9c84b78 100644
--- a/code/modules/events/comms_blackout.dm
+++ b/code/modules/events/comms_blackout.dm
@@ -2,7 +2,7 @@
if(!silent)
marine_announcement("Ionic radiation flare detected from nearby star. Imminent telecommunication failu*3mga;b4;'1v�-BZZZT", "Problem Detected", 'sound/misc/interference.ogg')
else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms
- for(var/mob/living/silicon/ai/A in ai_mob_list)
+ for(var/mob/living/silicon/ai/A in GLOB.ai_mob_list)
to_chat(A, "
")
to_chat(A, SPAN_WARNING("Ionic radiation flare detected from nearby star. Imminent telecommunication failu*3mga;b4;'1v�-BZZZT"))
to_chat(A, "
")
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index c7b1d65c7da2..ee3d749ec4fa 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -95,7 +95,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
//to_chat(src, "Danger Flash")
if(!halimage)
var/list/possible_points = list()
- for(var/turf/open/floor/F in view(src,world_view_size))
+ for(var/turf/open/floor/F in view(src,GLOB.world_view_size))
possible_points += F
if(possible_points.len)
var/turf/open/floor/target = pick(possible_points)
@@ -159,7 +159,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
//to_chat(src, "Danger Flash")
if(!halbody)
var/list/possible_points = list()
- for(var/turf/open/floor/F in view(src,world_view_size))
+ for(var/turf/open/floor/F in view(src,GLOB.world_view_size))
possible_points += F
if(possible_points.len)
var/turf/open/floor/target = pick(possible_points)
@@ -249,7 +249,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
/obj/effect/fake_attacker/attackby(obj/item/P as obj, mob/user as mob)
step_away(src,my_target,2)
- for(var/mob/M in oviewers(world_view_size,my_target))
+ for(var/mob/M in oviewers(GLOB.world_view_size,my_target))
to_chat(M, SPAN_WARNING("[my_target] flails around wildly."))
my_target.show_message(SPAN_DANGER("[src] has been attacked by [my_target] "), SHOW_MESSAGE_VISIBLE) //Lazy.
@@ -262,7 +262,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(M == my_target)
step_away(src,my_target,2)
if(prob(30))
- for(var/mob/O in oviewers(world_view_size , my_target))
+ for(var/mob/O in oviewers(GLOB.world_view_size , my_target))
to_chat(O, SPAN_DANGER("[my_target] stumbles around."))
/obj/effect/fake_attacker/New()
@@ -341,9 +341,9 @@ Gunshots/explosions/opening doors/less rare audio (done)
QDEL_IN(O, 30 SECONDS)
return
-var/list/non_fakeattack_weapons = list(/obj/item/device/aicard,\
+GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/device/aicard,\
/obj/item/clothing/shoes/magboots, /obj/item/disk/nuclear,\
- /obj/item/clothing/suit/space/uscm, /obj/item/tank)
+ /obj/item/clothing/suit/space/uscm, /obj/item/tank))
/proc/fake_attack(mob/living/target)
// var/list/possible_clones = new/list()
@@ -363,11 +363,11 @@ var/list/non_fakeattack_weapons = list(/obj/item/device/aicard,\
//var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(outside_range(target))
var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(target.loc)
if(clone.l_hand)
- if(!(locate(clone.l_hand) in non_fakeattack_weapons))
+ if(!(locate(clone.l_hand) in GLOB.non_fakeattack_weapons))
clone_weapon = clone.l_hand.name
F.weap = clone.l_hand
else if (clone.r_hand)
- if(!(locate(clone.r_hand) in non_fakeattack_weapons))
+ if(!(locate(clone.r_hand) in GLOB.non_fakeattack_weapons))
clone_weapon = clone.r_hand.name
F.weap = clone.r_hand
diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm
index 39f832ea8ca8..5a5ecea2d03d 100644
--- a/code/modules/gear_presets/_select_equipment.dm
+++ b/code/modules/gear_presets/_select_equipment.dm
@@ -87,7 +87,7 @@
new_human.gender = pick(60;MALE,40;FEMALE)
var/datum/preferences/A = new()
A.randomize_appearance(new_human)
- var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
+ var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
new_human.change_real_name(new_human, random_name)
new_human.age = rand(21,45)
@@ -155,8 +155,8 @@
load_status(new_human, mob_client)
load_vanity(new_human, mob_client)
load_traits(new_human, mob_client)
- if(round_statistics && count_participant)
- round_statistics.track_new_participant(faction)
+ if(GLOB.round_statistics && count_participant)
+ GLOB.round_statistics.track_new_participant(faction)
new_human.assigned_equipment_preset = src
@@ -172,7 +172,7 @@
if(!new_human.client || !new_human.client.prefs || !new_human.client.prefs.gear)
return//We want to equip them with custom stuff second, after they are equipped with everything else.
for(var/gear_name in new_human.client.prefs.gear)
- var/datum/gear/current_gear = gear_datums_by_name[gear_name]
+ var/datum/gear/current_gear = GLOB.gear_datums_by_name[gear_name]
if(current_gear)
if(current_gear.allowed_roles && !(assignment in current_gear.allowed_roles))
to_chat(new_human, SPAN_WARNING("Custom gear [current_gear.display_name] cannot be equipped: Invalid Role"))
@@ -461,16 +461,16 @@
return 1
-var/list/rebel_shotguns = list(
+GLOBAL_LIST_INIT(rebel_shotguns, list(
/obj/item/weapon/gun/shotgun/double = /obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/flechette,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/weapon/gun/shotgun/double/sawn = /obj/item/ammo_magazine/handful/shotgun/buckshot
- )
+ ))
-var/list/rebel_smgs = list(
+GLOBAL_LIST_INIT(rebel_smgs, list(
/obj/item/weapon/gun/smg/pps43 = /obj/item/ammo_magazine/smg/pps43,
/obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27,
/obj/item/weapon/gun/smg/mp5 = /obj/item/ammo_magazine/smg/mp5,
@@ -478,9 +478,9 @@ var/list/rebel_smgs = list(
/obj/item/weapon/gun/smg/mac15 = /obj/item/ammo_magazine/smg/mac15,
/obj/item/weapon/gun/smg/uzi = /obj/item/ammo_magazine/smg/uzi,
/obj/item/weapon/gun/smg/fp9000 = /obj/item/ammo_magazine/smg/fp9000
- )
+ ))
-var/list/rebel_rifles = list(
+GLOBAL_LIST_INIT(rebel_rifles, list(
/obj/item/weapon/gun/rifle/mar40 = /obj/item/ammo_magazine/rifle/mar40,
/obj/item/weapon/gun/rifle/mar40 = /obj/item/ammo_magazine/rifle/mar40,
/obj/item/weapon/gun/rifle/mar40/carbine = /obj/item/ammo_magazine/rifle/mar40,
@@ -490,13 +490,13 @@ var/list/rebel_rifles = list(
/obj/item/weapon/gun/rifle/ar10 = /obj/item/ammo_magazine/rifle/ar10,
/obj/item/weapon/gun/rifle/l42a/abr40 = /obj/item/ammo_magazine/rifle/l42a/abr40,
/obj/item/weapon/gun/rifle/l42a/abr40 = /obj/item/ammo_magazine/rifle/l42a/abr40,
- )
+ ))
/datum/equipment_preset/proc/spawn_rebel_smg(atom/M, ammo_amount = 12)
if(!M) return
- var/gunpath = pick(rebel_smgs)
- var/ammopath = rebel_smgs[gunpath]
+ var/gunpath = pick(GLOB.rebel_smgs)
+ var/ammopath = GLOB.rebel_smgs[gunpath]
spawn_weapon(gunpath, ammopath, M, ammo_amount)
@@ -505,8 +505,8 @@ var/list/rebel_rifles = list(
/datum/equipment_preset/proc/spawn_rebel_shotgun(atom/M, ammo_amount = 12)
if(!M) return
- var/gunpath = pick(rebel_shotguns)
- var/ammopath = rebel_shotguns[gunpath]
+ var/gunpath = pick(GLOB.rebel_shotguns)
+ var/ammopath = GLOB.rebel_shotguns[gunpath]
spawn_weapon(gunpath, ammopath, M, ammo_amount)
@@ -515,8 +515,8 @@ var/list/rebel_rifles = list(
/datum/equipment_preset/proc/spawn_rebel_rifle(atom/M, ammo_amount = 12)
if(!M) return
- var/gunpath = pick(rebel_rifles)
- var/ammopath = rebel_rifles[gunpath]
+ var/gunpath = pick(GLOB.rebel_rifles)
+ var/ammopath = GLOB.rebel_rifles[gunpath]
spawn_weapon(gunpath, ammopath, M, ammo_amount)
@@ -575,10 +575,10 @@ var/list/rebel_rifles = list(
if(!M) return
var/list/merc_shotguns = list(
- /obj/item/weapon/gun/shotgun/merc = pick(shotgun_handfuls_12g),
- /obj/item/weapon/gun/shotgun/combat = pick(shotgun_handfuls_12g),
- /obj/item/weapon/gun/shotgun/double/with_stock = pick(shotgun_handfuls_12g),
- /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = pick(shotgun_handfuls_12g))
+ /obj/item/weapon/gun/shotgun/merc = pick(GLOB.shotgun_handfuls_12g),
+ /obj/item/weapon/gun/shotgun/combat = pick(GLOB.shotgun_handfuls_12g),
+ /obj/item/weapon/gun/shotgun/double/with_stock = pick(GLOB.shotgun_handfuls_12g),
+ /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = pick(GLOB.shotgun_handfuls_12g))
var/gunpath = pick(merc_shotguns)
var/ammopath = merc_shotguns[gunpath]
@@ -610,9 +610,9 @@ var/list/rebel_rifles = list(
/obj/item/weapon/gun/rifle/m41a/elite = /obj/item/ammo_magazine/rifle/ap)
var/list/elite_merc_shotguns = list(
- /obj/item/weapon/gun/shotgun/merc = pick(shotgun_handfuls_12g),
- /obj/item/weapon/gun/shotgun/combat = pick(shotgun_handfuls_12g),
- /obj/item/weapon/gun/shotgun/type23 = pick(shotgun_handfuls_8g))
+ /obj/item/weapon/gun/shotgun/merc = pick(GLOB.shotgun_handfuls_12g),
+ /obj/item/weapon/gun/shotgun/combat = pick(GLOB.shotgun_handfuls_12g),
+ /obj/item/weapon/gun/shotgun/type23 = pick(GLOB.shotgun_handfuls_8g))
if(prob(shotgun_chance))
var/gunpath = pick(elite_merc_shotguns)
diff --git a/code/modules/gear_presets/agents.dm b/code/modules/gear_presets/agents.dm
index dcf2a367b677..b51e623a198c 100644
--- a/code/modules/gear_presets/agents.dm
+++ b/code/modules/gear_presets/agents.dm
@@ -115,7 +115,7 @@
A.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male_dutch)] [pick(last_names_clf)]"
+ random_name = "[pick(GLOB.first_names_male_dutch)] [pick(GLOB.last_names_clf)]"
new_human.f_style = "Shaved"
new_human.change_real_name(new_human, random_name)
diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm
index 9afc89ab65c6..62cbeb9edd29 100644
--- a/code/modules/gear_presets/clf.dm
+++ b/code/modules/gear_presets/clf.dm
@@ -21,18 +21,18 @@
if(prob(40))
first_name = "[capitalize(randomly_generate_japanese_word(rand(1, 3)))]"
else
- first_name = "[pick(first_names_male_clf)]"
+ first_name = "[pick(GLOB.first_names_male_clf)]"
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
else
if(prob(40))
first_name = "[capitalize(randomly_generate_japanese_word(rand(1, 3)))]"
else
- first_name = "[pick(first_names_female_clf)]"
+ first_name = "[pick(GLOB.first_names_female_clf)]"
//surname
if(prob(35))
last_name = "[capitalize(randomly_generate_japanese_word(rand(1, 4)))]"
else
- last_name = "[pick(last_names_clf)]"
+ last_name = "[pick(GLOB.last_names_clf)]"
//put them together
random_name = "[first_name] [last_name]"
new_human.change_real_name(new_human, random_name)
@@ -723,9 +723,9 @@
if(prob(10))
random_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]"
else if(new_human.gender == MALE)
- random_name = "[pick(first_names_male_clf)]"
+ random_name = "[pick(GLOB.first_names_male_clf)]"
else
- random_name = "[pick(first_names_female_clf)]"
+ random_name = "[pick(GLOB.first_names_female_clf)]"
if(new_human.gender == MALE)
new_human.f_style = "5 O'clock Shadow"
diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm
index 578681979115..2dd2c531d787 100644
--- a/code/modules/gear_presets/cmb.dm
+++ b/code/modules/gear_presets/cmb.dm
@@ -17,7 +17,7 @@
var/datum/preferences/A = new()
A.randomize_appearance(new_human)
var/random_name
- random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
+ random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
new_human.change_real_name(new_human, random_name)
new_human.name = new_human.real_name
new_human.age = rand(22,45)
@@ -214,9 +214,9 @@
A.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male)]"
+ random_name = "[pick(GLOB.first_names_male)]"
else
- random_name = "[pick(first_names_female)]"
+ random_name = "[pick(GLOB.first_names_female)]"
if(new_human.gender == MALE)
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm
index c849092570cc..ea77fe4a4d0f 100644
--- a/code/modules/gear_presets/contractor.dm
+++ b/code/modules/gear_presets/contractor.dm
@@ -19,7 +19,7 @@
var/datum/preferences/A = new()
A.randomize_appearance(new_human)
var/random_name
- random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
+ random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
new_human.change_real_name(new_human, random_name)
new_human.name = new_human.real_name
new_human.age = rand(22,45)
@@ -367,9 +367,9 @@
A.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male)]"
+ random_name = "[pick(GLOB.first_names_male)]"
else
- random_name = "[pick(first_names_female)]"
+ random_name = "[pick(GLOB.first_names_female)]"
if(new_human.gender == MALE)
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
@@ -753,9 +753,9 @@
A.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male)]"
+ random_name = "[pick(GLOB.first_names_male)]"
else
- random_name = "[pick(first_names_female)]"
+ random_name = "[pick(GLOB.first_names_female)]"
if(new_human.gender == MALE)
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
diff --git a/code/modules/gear_presets/dust_raider.dm b/code/modules/gear_presets/dust_raider.dm
index e6464d56085e..1d979ed66a5f 100644
--- a/code/modules/gear_presets/dust_raider.dm
+++ b/code/modules/gear_presets/dust_raider.dm
@@ -10,7 +10,7 @@
var/datum/preferences/A = new()
A.randomize_appearance(new_human)
var/random_name
- random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
+ random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
new_human.change_real_name(new_human, random_name)
new_human.name = new_human.real_name
new_human.age = rand(21,45)
diff --git a/code/modules/gear_presets/dutch.dm b/code/modules/gear_presets/dutch.dm
index c83e8384f57a..2844eef68a96 100644
--- a/code/modules/gear_presets/dutch.dm
+++ b/code/modules/gear_presets/dutch.dm
@@ -19,10 +19,10 @@
human.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male_dutch)] [pick(last_names)]"
+ random_name = "[pick(GLOB.first_names_male_dutch)] [pick(GLOB.last_names)]"
new_human.f_style = "5 O'clock Shadow"
else
- random_name = "[pick(first_names_female_dutch)] [pick(last_names)]"
+ random_name = "[pick(GLOB.first_names_female_dutch)] [pick(GLOB.last_names)]"
new_human.change_real_name(new_human, random_name)
new_human.age = rand(25,35)
diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm
index 23350768a692..8bbe686b5cea 100644
--- a/code/modules/gear_presets/fun.dm
+++ b/code/modules/gear_presets/fun.dm
@@ -433,7 +433,7 @@
new_human.age = rand(1, 40)
/datum/equipment_preset/fun/monkey/proc/get_random_name(mob/living/carbon/human/new_human)
- return pick(monkey_names)
+ return pick(GLOB.monkey_names)
/datum/equipment_preset/fun/monkey/marine
name = "Fun - Monkey Marine"
@@ -460,7 +460,7 @@
paygrade = "UE1"
/datum/equipment_preset/fun/monkey/soldier/get_random_name(mob/living/carbon/human/new_human)
- return new_human.gender == MALE ? pick(first_names_male_upp) : pick(first_names_female_upp)
+ return new_human.gender == MALE ? pick(GLOB.first_names_male_upp) : pick(GLOB.first_names_female_upp)
/datum/equipment_preset/fun/monkey/soldier/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY)
diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm
index 0308c8d9e3cb..6a9fa4d6f55a 100644
--- a/code/modules/gear_presets/other.dm
+++ b/code/modules/gear_presets/other.dm
@@ -46,10 +46,10 @@
A.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male_colonist)] [pick(last_names_colonist)]"
+ random_name = "[pick(GLOB.first_names_male_colonist)] [pick(GLOB.last_names_colonist)]"
new_human.f_style = "5 O'clock Shadow"
else
- random_name = "[pick(first_names_female_colonist)] [pick(last_names_colonist)]"
+ random_name = "[pick(GLOB.first_names_female_colonist)] [pick(GLOB.last_names_colonist)]"
new_human.change_real_name(new_human, random_name)
new_human.age = rand(20,45)
new_human.r_hair = 25
@@ -105,7 +105,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
- spawn_weapon(/obj/item/weapon/gun/shotgun/type23, pick(shotgun_handfuls_8g), new_human, 0, 14) //shotgunner mini-spec
+ spawn_weapon(/obj/item/weapon/gun/shotgun/type23, pick(GLOB.shotgun_handfuls_8g), new_human, 0, 14) //shotgunner mini-spec
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK)
@@ -255,10 +255,10 @@
A.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male_colonist)] [pick(last_names_colonist)]"
+ random_name = "[pick(GLOB.first_names_male_colonist)] [pick(GLOB.last_names_colonist)]"
new_human.f_style = "5 O'clock Shadow"
else
- random_name = "[pick(first_names_female_colonist)] [pick(last_names_colonist)]"
+ random_name = "[pick(GLOB.first_names_female_colonist)] [pick(GLOB.last_names_colonist)]"
new_human.change_real_name(new_human, random_name)
new_human.age = rand(20,45)
new_human.r_hair = rand(15,35)
@@ -551,9 +551,9 @@
A.randomize_appearance(new_human)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male)] [pick(last_names)]"
+ random_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]"
else
- random_name = "[pick(first_names_female)] [pick(last_names)]"
+ random_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]"
new_human.change_real_name(new_human, random_name)
new_human.age = rand(17,45)
@@ -641,7 +641,7 @@
new_human.gender = pick(MALE, FEMALE)
var/datum/preferences/A = new
A.randomize_appearance(new_human)
- var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
+ var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
new_human.change_real_name(new_human, random_name)
new_human.age = rand(21,45)
@@ -681,7 +681,7 @@
new_human.gender = pick(MALE, FEMALE)
var/datum/preferences/A = new
A.randomize_appearance(new_human)
- var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male_gladiator : first_names_female_gladiator))
+ var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male_gladiator : GLOB.first_names_female_gladiator))
new_human.change_real_name(new_human, random_name)
new_human.age = rand(21,45)
@@ -806,7 +806,7 @@
var/list/huds_to_add = list(MOB_HUD_XENO_INFECTION, MOB_HUD_XENO_STATUS)
for(var/hud_to_add in huds_to_add)
- var/datum/mob_hud/hud = huds[hud_to_add]
+ var/datum/mob_hud/hud = GLOB.huds[hud_to_add]
hud.add_hud_to(new_human, new_human)
var/list/actions_to_add = subtypesof(/datum/action/human_action/activable/cult)
diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm
index 1ec17a1a561d..9571859b0f0f 100644
--- a/code/modules/gear_presets/pmc.dm
+++ b/code/modules/gear_presets/pmc.dm
@@ -26,17 +26,17 @@
if(prob(10))
first_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]"
else
- first_name = "[pick(first_names_male_pmc)]"
+ first_name = "[pick(GLOB.first_names_male_pmc)]"
new_human.f_style = "5 O'clock Shadow"
else
if(prob(10))
first_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]"
else
- first_name = "[pick(first_names_female_pmc)]"
+ first_name = "[pick(GLOB.first_names_female_pmc)]"
if(prob(25))
last_name = "[capitalize(randomly_generate_japanese_word(rand(2, 4)))]"
else
- last_name = "[pick(last_names_pmc)]"
+ last_name = "[pick(GLOB.last_names_pmc)]"
random_name = "[first_name] [last_name]"
new_human.change_real_name(new_human, random_name)
new_human.age = rand(25,35)
@@ -1860,9 +1860,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
if(prob(10))
random_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]"
else if(new_human.gender == MALE)
- random_name = "[pick(first_names_male_pmc)]"
+ random_name = "[pick(GLOB.first_names_male_pmc)]"
else
- random_name = "[pick(first_names_female_pmc)]"
+ random_name = "[pick(GLOB.first_names_female_pmc)]"
if(new_human.gender == MALE)
new_human.f_style = "5 O'clock Shadow"
diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm
index c990f19fdb27..90361a24cc57 100644
--- a/code/modules/gear_presets/royal_marines.dm
+++ b/code/modules/gear_presets/royal_marines.dm
@@ -24,11 +24,11 @@
new_human.b_eyes = colors[eye_color][3]
idtype = /obj/item/card/id/dogtag
if(new_human.gender == MALE)
- random_name = "[pick(first_names_male)] [pick(last_names)]"
+ random_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]"
new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",)
new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",)
else
- random_name = "[pick(first_names_female)] [pick(last_names)]"
+ random_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]"
new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",)
new_human.change_real_name(new_human, random_name)
new_human.age = rand(20,45)
diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm
index 6d7036635b1c..7a346fe1edd6 100644
--- a/code/modules/gear_presets/survivors/survivors.dm
+++ b/code/modules/gear_presets/survivors/survivors.dm
@@ -22,7 +22,7 @@
new_human.gender = pick(MALE, FEMALE)
var/datum/preferences/A = new
A.randomize_appearance(new_human)
- var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
+ var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
new_human.change_real_name(new_human, random_name)
new_human.age = rand(21,45)
@@ -339,7 +339,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
present in xenomorph.dm file
-var/list/survivor_types = list(
+GLOBAL_LIST_INIT(survivor_types, list()
/datum/equipment_preset/survivor/scientist,
/datum/equipment_preset/survivor/doctor,
/datum/equipment_preset/survivor/security,
diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
index 9ac7950b7246..651a324003bc 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -668,11 +668,11 @@
var/datum/preferences/A = new()
A.randomize_appearance(new_human)
if(new_human.gender == MALE)
- first_name = "[pick(first_names_male_colonist)]"
+ first_name = "[pick(GLOB.first_names_male_colonist)]"
else
- first_name ="[pick(first_names_female_colonist)]"
+ first_name ="[pick(GLOB.first_names_female_colonist)]"
- last_name ="[pick(last_names_colonist)]"
+ last_name ="[pick(GLOB.last_names_colonist)]"
random_name = "[first_name] [last_name]"
new_human.change_real_name(new_human, random_name)
var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19))
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 6c361795b4a6..4f05d43dd5ce 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -21,18 +21,18 @@
if(prob(40))
first_name = "[capitalize(randomly_generate_chinese_word(1))]"
else
- first_name = "[pick(first_names_male_upp)]"
+ first_name = "[pick(GLOB.first_names_male_upp)]"
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
else
if(prob(40))
first_name = "[capitalize(randomly_generate_chinese_word(1))]"
else
- first_name = "[pick(first_names_female_upp)]"
+ first_name = "[pick(GLOB.first_names_female_upp)]"
//surname
if(prob(35))
last_name = "[capitalize(randomly_generate_chinese_word(pick(20;1, 80;2)))]"
else
- last_name = "[pick(last_names_upp)]"
+ last_name = "[pick(GLOB.last_names_upp)]"
//put them together
random_name = "[first_name] [last_name]"
@@ -2603,9 +2603,9 @@
if(prob(10))
random_name = "[capitalize(randomly_generate_chinese_word(2))]"
else if(new_human.gender == MALE)
- random_name = "[pick(first_names_male_upp)]"
+ random_name = "[pick(GLOB.first_names_male_upp)]"
else
- random_name = "[pick(first_names_female_upp)]"
+ random_name = "[pick(GLOB.first_names_female_upp)]"
if(new_human.gender == MALE)
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm
index baee71eee8b4..e7b19abd0342 100644
--- a/code/modules/gear_presets/uscm.dm
+++ b/code/modules/gear_presets/uscm.dm
@@ -860,7 +860,7 @@
uses_special_name = TRUE
/datum/equipment_preset/uscm/marsoc/covert/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = MALE
- new_human.change_real_name(new_human, "[pick(nato_phonetic_alphabet)]")
+ new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]")
new_human.age = rand(20,30)
/datum/equipment_preset/uscm/marsoc/covert/load_rank(mob/living/carbon/human/new_human)
return "O"
@@ -888,7 +888,7 @@
uses_special_name = TRUE
/datum/equipment_preset/uscm/marsoc/sl/covert/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = MALE
- new_human.change_real_name(new_human, "[pick(nato_phonetic_alphabet)]")
+ new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]")
new_human.age = rand(20,30)
/datum/equipment_preset/uscm/marsoc/sl/covert/load_rank(mob/living/carbon/human/new_human)
return "O"
diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm
index dde564f93375..482bdea882d3 100644
--- a/code/modules/gear_presets/whiteout.dm
+++ b/code/modules/gear_presets/whiteout.dm
@@ -27,9 +27,9 @@
//A.randomize_appearance(mob)
var/random_name
if(new_human.gender == MALE)
- random_name = "[pick(greek_letters)]"
+ random_name = "[pick(GLOB.greek_letters)]"
else
- random_name = "[pick(greek_letters)]"
+ random_name = "[pick(GLOB.greek_letters)]"
new_human.change_real_name(new_human, random_name)
new_human.age = rand(17,45)
diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm
index 5160f0bf319a..1be8cb990255 100644
--- a/code/modules/gear_presets/wy_goons.dm
+++ b/code/modules/gear_presets/wy_goons.dm
@@ -22,11 +22,11 @@
var/last_name
//gender checks
if(new_human.gender == MALE)
- first_name = "[pick(first_names_male_pmc)]"
+ first_name = "[pick(GLOB.first_names_male_pmc)]"
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
else
- first_name = "[pick(first_names_female_pmc)]"
- last_name = "[pick(last_names_pmc)]"
+ first_name = "[pick(GLOB.first_names_female_pmc)]"
+ last_name = "[pick(GLOB.last_names_pmc)]"
random_name = "[first_name] [last_name]"
new_human.change_real_name(new_human, random_name)
diff --git a/code/modules/holidays/halloween/decorators.dm b/code/modules/holidays/halloween/decorators.dm
index b25d6ff6b957..6575ed5ba665 100644
--- a/code/modules/holidays/halloween/decorators.dm
+++ b/code/modules/holidays/halloween/decorators.dm
@@ -90,7 +90,7 @@
// Skip this if this corner is result of a door connection (mostly for Almayer shutters)
var/valid = TRUE
- for(var/a_cardinal in cardinal)
+ for(var/a_cardinal in GLOB.cardinals)
var/cardinal_dir = diag & a_cardinal
if(!a_cardinal) // We check cardinals contributing to that diagonal
continue
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index 38ff3ea26528..e47ad43acaf1 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -15,7 +15,7 @@
// Fill the object up with the appropriate reagents.
if(!isnull(plantname))
- var/datum/seed/S = seed_types[plantname]
+ var/datum/seed/S = GLOB.seed_types[plantname]
if(!S || !S.chems)
return
diff --git a/code/modules/hydroponics/hydro_tools.dm b/code/modules/hydroponics/hydro_tools.dm
index cc4ef0daf7f3..b7e3d8bb84c5 100644
--- a/code/modules/hydroponics/hydro_tools.dm
+++ b/code/modules/hydroponics/hydro_tools.dm
@@ -19,11 +19,11 @@
return ..()
else if(istype(target,/obj/item/reagent_container/food/snacks/grown))
var/obj/item/reagent_container/food/snacks/grown/G = target
- grown_seed = seed_types[G.plantname]
+ grown_seed = GLOB.seed_types[G.plantname]
grown_reagents = G.reagents
else if(istype(target,/obj/item/grown))
var/obj/item/grown/G = target
- grown_seed = seed_types[G.plantname]
+ grown_seed = GLOB.seed_types[G.plantname]
grown_reagents = G.reagents
else if(istype(target,/obj/item/seeds))
var/obj/item/seeds/S = target
diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm
index 4d175c5a6f1f..d3a086d96e04 100644
--- a/code/modules/hydroponics/hydro_tray.dm
+++ b/code/modules/hydroponics/hydro_tray.dm
@@ -426,7 +426,7 @@
//Remove the seed if something is already planted.
if(seed) seed = null
- seed = seed_types[pick(list("mushrooms","plumphelmet","harebells","poppies","grass","weeds"))]
+ seed = GLOB.seed_types[pick(list("mushrooms","plumphelmet","harebells","poppies","grass","weeds"))]
if(!seed) return //Weed does not exist, someone fucked up.
dead = 0
@@ -456,7 +456,7 @@
// We need to make sure we're not modifying one of the global seed datums.
// If it's not in the global list, then no products of the line have been
// harvested yet and it's safe to assume it's restricted to this tray.
- if(!isnull(seed_types[seed.name]))
+ if(!isnull(GLOB.seed_types[seed.name]))
seed = seed.diverge()
seed.mutate(severity,get_turf(src))
@@ -481,8 +481,8 @@
var/previous_plant = seed.display_name
var/newseed = seed.get_mutant_variant()
- if(newseed in seed_types)
- seed = seed_types[newseed]
+ if(newseed in GLOB.seed_types)
+ seed = GLOB.seed_types[newseed]
else
return
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index 2aff95eb1fcc..04339f77c9bc 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -1,5 +1,5 @@
-var/global/list/seed_types = list() // A list of all seed data.
-var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious trial and error goodness.
+GLOBAL_LIST_EMPTY(seed_types) // A list of all seed data.
+GLOBAL_LIST_EMPTY(gene_tag_masks) // Gene obfuscation for delicious trial and error goodness.
// Debug for testing seed genes.
/client/proc/show_plant_genes()
@@ -9,12 +9,12 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria
if(!admin_holder) return
- if(!gene_tag_masks)
+ if(!GLOB.gene_tag_masks)
to_chat(usr, "Gene masks not set.")
return
- for(var/mask in gene_tag_masks)
- to_chat(usr, "[mask]: [gene_tag_masks[mask]]")
+ for(var/mask in GLOB.gene_tag_masks)
+ to_chat(usr, "[mask]: [GLOB.gene_tag_masks[mask]]")
// Predefined/roundstart varieties use a string key to make it
// easier to grab the new variety when mutating. Post-roundstart
@@ -26,8 +26,8 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria
// Populate the global seed datum list.
for(var/type in typesof(/datum/seed)-/datum/seed)
var/datum/seed/S = new type
- seed_types[S.name] = S
- S.uid = "[seed_types.len]"
+ GLOB.seed_types[S.name] = S
+ S.uid = "[GLOB.seed_types.len]"
S.roundstart = 1
// Make sure any seed packets that were mapped in are updated
@@ -54,7 +54,7 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria
used_masks += gene_mask
gene_tags -= gene_tag
- gene_tag_masks[gene_tag] = gene_mask
+ GLOB.gene_tag_masks[gene_tag] = gene_mask
/datum/plantgene
var/genetype // Label used when applying trait.
@@ -379,12 +379,12 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria
else
source_turf.visible_message(SPAN_NOTICE("\The [display_name]'s flowers wither and fall off."))
else //New chems! (20% chance)
- var/new_chem = list(pick( prob(10);pick(chemical_gen_classes_list["C1"]),\
- prob(15);pick(chemical_gen_classes_list["C2"]),\
- prob(25);pick(chemical_gen_classes_list["C3"]),\
- prob(30);pick(chemical_gen_classes_list["C4"]),\
- prob(15);pick(chemical_gen_classes_list["T1"]),\
- prob(5);pick(chemical_gen_classes_list["T2"])) = list(1,rand(1,2)))
+ var/new_chem = list(pick( prob(10);pick(GLOB.chemical_gen_classes_list["C1"]),\
+ prob(15);pick(GLOB.chemical_gen_classes_list["C2"]),\
+ prob(25);pick(GLOB.chemical_gen_classes_list["C3"]),\
+ prob(30);pick(GLOB.chemical_gen_classes_list["C4"]),\
+ prob(15);pick(GLOB.chemical_gen_classes_list["T1"]),\
+ prob(5);pick(GLOB.chemical_gen_classes_list["T2"])) = list(1,rand(1,2)))
chems += new_chem
@@ -580,10 +580,10 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria
to_chat(user, "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].")
//This may be a new line. Update the global if it is.
- if(name == "new line" || !(name in seed_types))
- uid = seed_types.len + 1
+ if(name == "new line" || !(name in GLOB.seed_types))
+ uid = GLOB.seed_types.len + 1
name = "[uid]"
- seed_types[name] = src
+ GLOB.seed_types[name] = src
if(harvest_sample)
var/obj/item/seeds/seeds = new(get_turf(user))
diff --git a/code/modules/hydroponics/seed_machines/seed_editor.dm b/code/modules/hydroponics/seed_machines/seed_editor.dm
index 2e89a9c7fb10..37e25fb3508a 100644
--- a/code/modules/hydroponics/seed_machines/seed_editor.dm
+++ b/code/modules/hydroponics/seed_machines/seed_editor.dm
@@ -21,7 +21,7 @@
data["sourceName"] = loaded_disk.genesource
for(var/datum/plantgene/P in loaded_disk.genes)
- locus.Add("[gene_tag_masks[P.genetype]]")
+ locus.Add("[GLOB.gene_tag_masks[P.genetype]]")
data["locus"] = locus
else
@@ -56,7 +56,7 @@
if(!loaded_disk || !seed)
return
- if(!isnull(seed_types[seed.seed.name]))
+ if(!isnull(GLOB.seed_types[seed.seed.name]))
seed.seed = seed.seed.diverge(1)
seed.seed_type = seed.seed.name
seed.update_seed()
diff --git a/code/modules/hydroponics/seed_machines/seed_extractor.dm b/code/modules/hydroponics/seed_machines/seed_extractor.dm
index 4f8867596c76..58d11e7990fc 100644
--- a/code/modules/hydroponics/seed_machines/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_machines/seed_extractor.dm
@@ -16,10 +16,10 @@
var/list/data = list()
var/list/geneMasks = list()
- for(var/gene_tag in gene_tag_masks)
+ for(var/gene_tag in GLOB.gene_tag_masks)
var/list/genedata = list(list(
"tag" = gene_tag,
- "mask" = gene_tag_masks[gene_tag]
+ "mask" = GLOB.gene_tag_masks[gene_tag]
))
geneMasks += genedata
@@ -89,8 +89,8 @@
if(!genetics.roundstart)
loaded_disk.genesource += " (variety #[genetics.uid])"
- loaded_disk.name += " ([gene_tag_masks[params["gene"]]], #[genetics.uid])"
- loaded_disk.desc += " The label reads \'gene [gene_tag_masks[params["gene"]]], sampled from [genetics.display_name]\'."
+ loaded_disk.name += " ([GLOB.gene_tag_masks[params["gene"]]], #[genetics.uid])"
+ loaded_disk.desc += " The label reads \'gene [GLOB.gene_tag_masks[params["gene"]]], sampled from [genetics.display_name]\'."
playsound(loc, 'sound/machines/fax.ogg', 15, 1)
eject_disk()
diff --git a/code/modules/hydroponics/seed_machines/seed_machines.dm b/code/modules/hydroponics/seed_machines/seed_machines.dm
index 501118465ecf..ad3fbed4625f 100644
--- a/code/modules/hydroponics/seed_machines/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines/seed_machines.dm
@@ -30,10 +30,10 @@
return
seed.forceMove(get_turf(src))
- if(seed.seed.name == "new line" || isnull(seed_types[seed.seed.name]))
- seed.seed.uid = seed_types.len + 1
+ if(seed.seed.name == "new line" || isnull(GLOB.seed_types[seed.seed.name]))
+ seed.seed.uid = GLOB.seed_types.len + 1
seed.seed.name = "[seed.seed.uid]"
- seed_types[seed.seed.name] = seed.seed
+ GLOB.seed_types[seed.seed.name] = seed.seed
seed.update_seed()
playsound(src, 'sound/machines/terminal_eject.ogg', 25, TRUE)
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index ca203dcc1ada..1895389abb07 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -50,8 +50,8 @@
//Grabs the appropriate seed datum from the global list.
/obj/item/seeds/proc/update_seed()
- if(!seed && seed_type && !isnull(seed_types) && seed_types[seed_type])
- seed = seed_types[seed_type]
+ if(!seed && seed_type && !isnull(GLOB.seed_types) && GLOB.seed_types[seed_type])
+ seed = GLOB.seed_types[seed_type]
update_appearance()
//Updates strings and icon appropriately based on seed datum.
diff --git a/code/modules/hydroponics/vines.dm b/code/modules/hydroponics/vines.dm
index 14091a1d29bb..9268d3279539 100644
--- a/code/modules/hydroponics/vines.dm
+++ b/code/modules/hydroponics/vines.dm
@@ -193,7 +193,7 @@
overlays += flower_overlay
/obj/effect/plantsegment/proc/spread()
- var/direction = pick(cardinal)
+ var/direction = pick(GLOB.cardinals)
var/step = get_step(src,direction)
if(istype(step,/turf/open/floor))
var/turf/open/floor/F = step
diff --git a/code/modules/maptext_alerts/text_blurbs.dm b/code/modules/maptext_alerts/text_blurbs.dm
index c942543f88df..297b02aff3a3 100644
--- a/code/modules/maptext_alerts/text_blurbs.dm
+++ b/code/modules/maptext_alerts/text_blurbs.dm
@@ -5,7 +5,7 @@
set waitfor = 0
var/areaname = replacetext(A.name, "\improper", "") //The \improper flickers "ÿ" briefly
- var/text = "[worldtime2text("hhmm")], [time2text(REALTIMEOFDAY, "DD-MMM-[game_year]")]\n[station_name], [areaname]"
+ var/text = "[worldtime2text("hhmm")], [time2text(REALTIMEOFDAY, "DD-MMM-[GLOB.game_year]")]\n[MAIN_SHIP_NAME], [areaname]"
show_blurb(targets, duration, text, TRUE)
@@ -14,13 +14,13 @@ exempt_ztraits = trait or list of traits of zlevels where any marines don't see
shouldn't see the ship marines' drop message. Ex. ZTRAIT_GROUND by default.
unit = the unit the marines are from. FF, Dust Raiders etc. Military crew see this.
base = the base the marines are staging from. The ship, Whiskey Outpost etc. Noncombat crew see this.**/
-/proc/show_blurb_uscm(list/exempt_ztraits = ZTRAIT_GROUND, unit = "2nd Bat. 'Falling Falcons'", base = station_name)
+/proc/show_blurb_uscm(list/exempt_ztraits = ZTRAIT_GROUND, unit = "2nd Bat. 'Falling Falcons'", base = MAIN_SHIP_NAME)
if(!islist(exempt_ztraits))
exempt_ztraits = list(exempt_ztraits)
var/list/exempt_zlevels = SSmapping.levels_by_any_trait(exempt_ztraits)
- var/base_text = "[uppertext(round_statistics.round_name)]\n\
- [worldtime2text("hhmm hrs")], [uppertext(time2text(REALTIMEOFDAY, "DD-MMM-[game_year]"))]\n\
+ var/base_text = "[uppertext(GLOB.round_statistics.round_name)]\n\
+ [worldtime2text("hhmm hrs")], [uppertext(time2text(REALTIMEOFDAY, "DD-MMM-[GLOB.game_year]"))]\n\
[SSmapping.configs[GROUND_MAP].map_name]"
var/list/post_text = list("combat" = "\n[unit]",
diff --git a/code/modules/mob/camera/imaginary_friend.dm b/code/modules/mob/camera/imaginary_friend.dm
index 0be51ede324a..4e7be80056de 100644
--- a/code/modules/mob/camera/imaginary_friend.dm
+++ b/code/modules/mob/camera/imaginary_friend.dm
@@ -150,21 +150,21 @@
var/datum/mob_hud/hud
switch(hud_choice)
if("Medical HUD")
- hud = huds[MOB_HUD_MEDICAL_OBSERVER]
+ hud = GLOB.huds[MOB_HUD_MEDICAL_OBSERVER]
if("Security HUD")
- hud = huds[MOB_HUD_SECURITY_ADVANCED]
+ hud = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
if("Squad HUD")
- hud = huds[MOB_HUD_FACTION_OBSERVER]
+ hud = GLOB.huds[MOB_HUD_FACTION_OBSERVER]
if("Xeno Status HUD")
- hud = huds[MOB_HUD_XENO_STATUS]
+ hud = GLOB.huds[MOB_HUD_XENO_STATUS]
if("Faction UPP HUD")
- hud = huds[MOB_HUD_FACTION_UPP]
+ hud = GLOB.huds[MOB_HUD_FACTION_UPP]
if("Faction Wey-Yu HUD")
- hud = huds[MOB_HUD_FACTION_WY]
+ hud = GLOB.huds[MOB_HUD_FACTION_WY]
if("Faction TWE HUD")
- hud = huds[MOB_HUD_FACTION_TWE]
+ hud = GLOB.huds[MOB_HUD_FACTION_TWE]
if("Faction CLF HUD")
- hud = huds[MOB_HUD_FACTION_CLF]
+ hud = GLOB.huds[MOB_HUD_FACTION_CLF]
if(hud_choice in current_huds)
hud.remove_hud_from(src, src)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 8d9513093349..4316e5804b40 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -117,7 +117,7 @@
forceMove(spawn_turf)
if(!name) //To prevent nameless ghosts
- name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
+ name = capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names))
if(name == "Unknown")
if(body)
name = body.real_name
@@ -389,28 +389,28 @@
if(HUD_toggled[i])
switch(i)
if("Medical HUD")
- H = huds[MOB_HUD_MEDICAL_OBSERVER]
+ H = GLOB.huds[MOB_HUD_MEDICAL_OBSERVER]
H.add_hud_to(src, src)
if("Security HUD")
- H = huds[MOB_HUD_SECURITY_ADVANCED]
+ H = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
H.add_hud_to(src, src)
if("Squad HUD")
- H = huds[MOB_HUD_FACTION_OBSERVER]
+ H = GLOB.huds[MOB_HUD_FACTION_OBSERVER]
H.add_hud_to(src, src)
if("Xeno Status HUD")
- H = huds[MOB_HUD_XENO_STATUS]
+ H = GLOB.huds[MOB_HUD_XENO_STATUS]
H.add_hud_to(src, src)
if("Faction UPP HUD")
- H = huds[MOB_HUD_FACTION_UPP]
+ H = GLOB.huds[MOB_HUD_FACTION_UPP]
H.add_hud_to(src, src)
if("Faction Wey-Yu HUD")
- H = huds[MOB_HUD_FACTION_WY]
+ H = GLOB.huds[MOB_HUD_FACTION_WY]
H.add_hud_to(src, src)
if("Faction TWE HUD")
- H = huds[MOB_HUD_FACTION_TWE]
+ H = GLOB.huds[MOB_HUD_FACTION_TWE]
H.add_hud_to(src, src)
if("Faction CLF HUD")
- H = huds[MOB_HUD_FACTION_CLF]
+ H = GLOB.huds[MOB_HUD_FACTION_CLF]
H.add_hud_to(src, src)
see_invisible = INVISIBILITY_OBSERVER
@@ -469,20 +469,20 @@ Works together with spawning an observer, noted above.
if(!can_reenter_corpse)
away_timer = 300 //They'll never come back, so we can max out the timer right away.
- if(round_statistics)
- round_statistics.update_panel_data()
+ if(GLOB.round_statistics)
+ GLOB.round_statistics.update_panel_data()
track_death_calculations() //This needs to be done before mind is nullified
if(ghost.mind)
ghost.mind.original = ghost
else if(ghost.mind && ghost.mind.player_entity) //Use else here because track_death_calculations() already calls this.
- ghost.mind.player_entity.update_panel_data(round_statistics)
+ ghost.mind.player_entity.update_panel_data(GLOB.round_statistics)
ghost.mind.original = src
mind = null
if(ghost.client)
ghost.client.init_verbs()
- ghost.client.change_view(world_view_size) //reset view range to default
+ ghost.client.change_view(GLOB.world_view_size) //reset view range to default
ghost.client.pixel_x = 0 //recenters our view
ghost.client.pixel_y = 0
ghost.set_lighting_alpha_from_pref(ghost.client)
@@ -519,7 +519,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/living/proc/do_ghost()
if(stat == DEAD)
if(mind && mind.player_entity)
- mind.player_entity.update_panel_data(round_statistics)
+ mind.player_entity.update_panel_data(GLOB.round_statistics)
ghostize(TRUE)
else
var/list/options = list("Ghost", "Stay in body")
@@ -826,8 +826,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set category = "Ghost.Settings"
if(client)
- if(client.view != world_view_size)
- client.change_view(world_view_size)
+ if(client.view != GLOB.world_view_size)
+ client.change_view(GLOB.world_view_size)
else
client.change_view(14)
@@ -1127,7 +1127,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(src, SPAN_INFO("Wrong game mode. You have to be observing a Hunter Games round."))
return
- if(!waiting_for_drop_votes)
+ var/datum/game_mode/huntergames/mode = SSticker.mode
+
+ if(!mode.waiting_for_drop_votes)
to_chat(src, SPAN_INFO("There's no drop vote currently in progress. Wait for a supply drop to be announced!"))
return
@@ -1171,8 +1173,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "View Kill Feed"
set desc = "View global kill statistics tied to the game."
- if(round_statistics)
- round_statistics.show_kill_feed(src)
+ if(GLOB.round_statistics)
+ GLOB.round_statistics.show_kill_feed(src)
/mob/dead/observer/get_status_tab_items()
. = ..()
@@ -1260,7 +1262,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!key_to_use)
return
- if(!(RoleAuthority.roles_whitelist[key_to_use] & WHITELIST_PREDATOR))
+ if(!(GLOB.RoleAuthority.roles_whitelist[key_to_use] & WHITELIST_PREDATOR))
return
if(!SSticker.mode)
diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index 33af36991e17..b9a972bda5c2 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -21,7 +21,7 @@
if(!client)
return
- if(speaker && !speaker.client && client.prefs.toggles_chat & CHAT_GHOSTEARS && speaker.z == z && get_dist(speaker, src) <= world_view_size)
+ if(speaker && !speaker.client && client.prefs.toggles_chat & CHAT_GHOSTEARS && speaker.z == z && get_dist(speaker, src) <= GLOB.world_view_size)
//Does the speaker have a client? It's either random stuff that observers won't care about (Experiment 97B says, 'EHEHEHEHEHEHEHE')
//Or someone snoring. So we make it where they won't hear it.
return
@@ -52,10 +52,10 @@
var/mob/hologram/queen/queen_eye = speaker?.client?.eye
if(istype(queen_eye))
track += "(E) "
- if(client && client.prefs && client.prefs.toggles_chat & CHAT_GHOSTEARS && speaker.z == z && get_dist(speaker, src) <= world_view_size)
+ if(client && client.prefs && client.prefs.toggles_chat & CHAT_GHOSTEARS && speaker.z == z && get_dist(speaker, src) <= GLOB.world_view_size)
message = "[message]"
to_chat(src, "[comm_paygrade][speaker_name][alt_name] [track][verb], \"[message]\"")
- if (speech_sound && (get_dist(speaker, src) <= world_view_size && src.z == speaker.z))
+ if (speech_sound && (get_dist(speaker, src) <= GLOB.world_view_size && src.z == speaker.z))
var/turf/source = speaker? get_turf(speaker) : get_turf(src)
playsound_client(client, speech_sound, source, sound_vol)
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index 6c825ec50994..608458e2dd0d 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -63,7 +63,7 @@
jitteriness = 0
if(client)
- client.change_view(world_view_size) //just so we never get stuck with a large view somehow
+ client.change_view(GLOB.world_view_size) //just so we never get stuck with a large view somehow
if(s_active) //Close inventory screens.
s_active.storage_close(src)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 19f461be757c..cbe3d2fdaaa6 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -16,7 +16,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if (language && (language.flags & NONVERBAL))
- if (!speaker || (src.sdisabilities & DISABILITY_BLIND || src.blinded) || !(speaker.z == z && get_dist(speaker, src) <= world_view_size))
+ if (!speaker || (src.sdisabilities & DISABILITY_BLIND || src.blinded) || !(speaker.z == z && get_dist(speaker, src) <= GLOB.world_view_size))
message = language.scramble(message)
if(!say_understands(speaker,language))
@@ -51,7 +51,7 @@
to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] talks but you cannot hear them."))
else
to_chat(src, SPAN_LOCALSAY("[comm_paygrade][speaker_name][alt_name] [verb], \"[message]\""))
- if (speech_sound && (get_dist(speaker, src) <= world_view_size && src.z == speaker.z))
+ if (speech_sound && (get_dist(speaker, src) <= GLOB.world_view_size && src.z == speaker.z))
var/turf/source = speaker? get_turf(speaker) : get_turf(src)
playsound_client(src.client, speech_sound, source, sound_vol, GET_RANDOM_FREQ)
diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm
index 60fe422c0e4b..ec55e6c51b59 100644
--- a/code/modules/mob/living/brain/brain.dm
+++ b/code/modules/mob/living/brain/brain.dm
@@ -76,5 +76,5 @@
set desc = "Relinquish your sentience and visit the land of the past."
if(mind && mind.player_entity)
- mind.player_entity.update_panel_data(round_statistics)
+ mind.player_entity.update_panel_data(GLOB.round_statistics)
ghostize(TRUE)
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index c8925239c33b..4f1b4f193275 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -67,4 +67,4 @@
brainmob.mind.transfer_to(target)
else
target.key = brainmob.key
- if(target.client) target.client.change_view(world_view_size)
+ if(target.client) target.client.change_view(GLOB.world_view_size)
diff --git a/code/modules/mob/living/carbon/carbon_helpers.dm b/code/modules/mob/living/carbon/carbon_helpers.dm
index 92d049b977bc..4d3c7b9144b6 100644
--- a/code/modules/mob/living/carbon/carbon_helpers.dm
+++ b/code/modules/mob/living/carbon/carbon_helpers.dm
@@ -18,7 +18,7 @@
var/view_rating = view_change_sources[view_source]
if(highest_view < view_rating)
highest_view = view_rating
- if(source && new_size != world_view_size)
+ if(source && new_size != GLOB.world_view_size)
LAZYSET(view_change_sources, source, new_size)
if(new_size < highest_view)
new_size = highest_view
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 19810893694a..5890a44f4168 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -82,8 +82,8 @@
last_living_human = null
break
last_living_human = cur_human
- if(last_living_human && (last_qm_callout + 2 MINUTES) < world.time)
- last_qm_callout = world.time
+ if(last_living_human && (GLOB.last_qm_callout + 2 MINUTES) < world.time)
+ GLOB.last_qm_callout = world.time
// Tell the xenos where the human is.
xeno_announcement("I sense the last tallhost hiding in [get_area(last_living_human)].", XENO_HIVE_NORMAL, SPAN_ANNOUNCEMENT_HEADER_BLUE("[QUEEN_MOTHER_ANNOUNCE]"))
// Tell the human he is the last guy.
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 6e99ca1e5a15..faf62c4f1ebe 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -520,16 +520,16 @@
switch(hudtype)
if("security")
if(skillcheck(passed_human, SKILL_POLICE, SKILL_POLICE_SKILLED))
- var/datum/mob_hud/sec_hud = huds[MOB_HUD_SECURITY_ADVANCED]
+ var/datum/mob_hud/sec_hud = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
if(locate(passed_mob) in sec_hud.hudusers)
return TRUE
if("medical")
if(skillcheck(passed_human, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC))
- var/datum/mob_hud/med_hud = huds[MOB_HUD_MEDICAL_ADVANCED]
+ var/datum/mob_hud/med_hud = GLOB.huds[MOB_HUD_MEDICAL_ADVANCED]
if(locate(passed_mob) in med_hud.hudusers)
return TRUE
if("squadleader")
- var/datum/mob_hud/faction_hud = huds[MOB_HUD_FACTION_USCM]
+ var/datum/mob_hud/faction_hud = GLOB.huds[MOB_HUD_FACTION_USCM]
if(passed_human.mind && passed_human.assigned_squad && passed_human.assigned_squad.squad_leader == passed_human && locate(passed_mob) in faction_hud.hudusers)
return TRUE
else
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 6bceb994a2a1..6cf915705e73 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -106,7 +106,7 @@
. += "Primary LZ: [SSticker.mode.active_lz.loc.loc.name]"
if(faction == FACTION_MARINE & !isnull(SSticker) && !isnull(SSticker.mode))
- . += "Operation Name: [round_statistics.round_name]"
+ . += "Operation Name: [GLOB.round_statistics.round_name]"
if(assigned_squad)
if(assigned_squad.overwatch_officer)
@@ -684,7 +684,7 @@
var/t1 = copytext(trim(strip_html(input("Your name and time will be added to this new comment.", "Add a comment", null, null) as message)), 1, MAX_MESSAGE_LEN)
if(!(t1) || usr.stat || usr.is_mob_restrained())
return
- var/created_at = text("[] [] []", time2text(world.realtime, "MMM DD"), time2text(world.time, "[worldtime2text()]:ss"), game_year)
+ var/created_at = text("[] [] []", time2text(world.realtime, "MMM DD"), time2text(world.time, "[worldtime2text()]:ss"), GLOB.game_year)
var/new_comment = list("entry" = t1, "created_by" = list("name" = "", "rank" = ""), "deleted_by" = null, "deleted_at" = null, "created_at" = created_at)
if(istype(usr,/mob/living/carbon/human))
var/mob/living/carbon/human/U = usr
@@ -813,10 +813,10 @@
counter++
if(istype(usr,/mob/living/carbon/human))
var/mob/living/carbon/human/U = usr
- R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
+ R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]")
if(istype(usr,/mob/living/silicon/robot))
var/mob/living/silicon/robot/U = usr
- R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
+ R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [GLOB.game_year]
[t1]")
if(href_list["medholocard"])
if(!skillcheck(usr, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC))
@@ -1342,13 +1342,13 @@
H = GLOB.marine_leaders[JOB_XO]
tracking_suffix = "_xo"
if(TRACKER_CL)
- var/datum/job/civilian/liaison/liaison_job = RoleAuthority.roles_for_mode[JOB_CORPORATE_LIAISON]
+ var/datum/job/civilian/liaison/liaison_job = GLOB.RoleAuthority.roles_for_mode[JOB_CORPORATE_LIAISON]
if(liaison_job?.active_liaison)
H = liaison_job.active_liaison
tracking_suffix = "_cl"
else
if(tracker_setting in squad_leader_trackers)
- var/datum/squad/S = RoleAuthority.squads_by_type[squad_leader_trackers[tracker_setting]]
+ var/datum/squad/S = GLOB.RoleAuthority.squads_by_type[squad_leader_trackers[tracker_setting]]
H = S.squad_leader
tracking_suffix = tracker_setting
@@ -1361,7 +1361,7 @@
hud_used.locate_leader.icon_state = "trackon[tracking_suffix]"
/mob/living/carbon/proc/locate_nearest_nuke()
- if(!bomb_set) return
+ if(!GLOB.bomb_set) return
var/obj/structure/machinery/nuclearbomb/N
for(var/obj/structure/machinery/nuclearbomb/bomb in world)
if(!istype(N) || N.z != src.z )
diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm
index fda4cea20ad1..718b31dbe9cb 100644
--- a/code/modules/mob/living/carbon/human/human_abilities.dm
+++ b/code/modules/mob/living/carbon/human/human_abilities.dm
@@ -558,7 +558,7 @@ CULT
H.cancel_camera()
H.reset_view()
- H.client.change_view(world_view_size, target)
+ H.client.change_view(GLOB.world_view_size, target)
H.client.pixel_x = 0
H.client.pixel_y = 0
@@ -590,7 +590,7 @@ CULT
remove_from(H)
H.unset_interaction()
- H.client.change_view(world_view_size, target)
+ H.client.change_view(GLOB.world_view_size, target)
H.client.pixel_x = 0
H.client.pixel_y = 0
H.reset_view()
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 5c685cc3acac..90a4d7bca4ab 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -372,7 +372,7 @@ This function restores all limbs.
/mob/living/carbon/human/get_limb(zone)
RETURN_TYPE(/obj/limb)
zone = check_zone(zone)
- return (locate(limb_types_by_name[zone]) in limbs)
+ return (locate(GLOB.limb_types_by_name[zone]) in limbs)
/mob/living/carbon/human/apply_armoured_damage(damage = 0, armour_type = ARMOR_MELEE, damage_type = BRUTE, def_zone = null, penetration = 0, armour_break_pr_pen = 0, armour_break_flat = 0)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 56eba38a4000..703840f7ba74 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -44,7 +44,7 @@ Contains most of the procs that are called when a mob is attacked by something
//If you don't specify a bodypart, it checks ALL your bodyparts for protection, and averages out the values
for(var/X in limbs)
var/obj/limb/E = X
- var/weight = organ_rel_size[E.name]
+ var/weight = GLOB.organ_rel_size[E.name]
armorval += getarmor_organ(E, type) * weight
total += weight
return (armorval/max(total, 1))
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 4416ba74fda3..1dd7ff5fe124 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -176,8 +176,8 @@
var/total_marine_playtime = 0
- for(var/job in RoleAuthority.roles_by_name)
- var/datum/job/J = RoleAuthority.roles_by_name[job]
+ for(var/job in GLOB.RoleAuthority.roles_by_name)
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[job]
if(istype(J, /datum/job/antag))
continue
diff --git a/code/modules/mob/living/carbon/human/powers/human_powers.dm b/code/modules/mob/living/carbon/human/powers/human_powers.dm
index 10b13225b314..b31d7cbcce76 100644
--- a/code/modules/mob/living/carbon/human/powers/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/powers/human_powers.dm
@@ -231,9 +231,9 @@
var/chosen_HUD = 1
switch(hud_choice)
if("Medical HUD")
- H = huds[MOB_HUD_MEDICAL_ADVANCED]
+ H = GLOB.huds[MOB_HUD_MEDICAL_ADVANCED]
if("Security HUD")
- H = huds[MOB_HUD_SECURITY_ADVANCED]
+ H = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
chosen_HUD = 2
else
return
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 28e45dcb2f5e..b31604d2cdd6 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -15,7 +15,7 @@
if(current_channel == " " || current_channel == ":" || current_channel == ".")
i--
break
- .["modes"] += department_radio_keys[":[current_channel]"]
+ .["modes"] += GLOB.department_radio_keys[":[current_channel]"]
.["message_and_language"] = copytext(message, i+1)
var/multibroadcast_cooldown = 0
for(var/obj/item/device/radio/headset/headset in list(wear_l_ear, wear_r_ear))
@@ -31,9 +31,9 @@
if(length(message) >= 2 && (message[1] == "." || message[1] == ":" || message[1] == "#"))
var/channel_prefix = copytext(message, 1, 3)
- if(channel_prefix in department_radio_keys)
+ if(channel_prefix in GLOB.department_radio_keys)
.["message_and_language"] = copytext(message, 3)
- .["modes"] += department_radio_keys[channel_prefix]
+ .["modes"] += GLOB.department_radio_keys[channel_prefix]
return
.["message_and_language"] = message
@@ -57,7 +57,7 @@
var/verb = "says"
var/alt_name = ""
- var/message_range = world_view_size
+ var/message_range = GLOB.world_view_size
var/italics = 0
if(!able_to_speak)
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 6c774432e776..f1ef5d40ec69 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -47,7 +47,7 @@
if(H.stat != CONSCIOUS)
return
if(prob(33) && isturf(H.loc) && !H.pulledby && !H.lying && !H.is_mob_restrained()) //won't move if being pulled
- step(H, pick(cardinal))
+ step(H, pick(GLOB.cardinals))
var/obj/held = H.get_active_hand()
if(held && prob(1))
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 3f415d8d3007..52f0a54b7a4f 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -470,7 +470,7 @@
/datum/species/proc/handle_blood_splatter(mob/living/carbon/human/human, splatter_dir)
var/color_override
if(human.special_blood)
- var/datum/reagent/D = chemical_reagents_list[human.special_blood]
+ var/datum/reagent/D = GLOB.chemical_reagents_list[human.special_blood]
if(D)
color_override = D.color
diff --git a/code/modules/mob/living/carbon/human/species/yautja/_species.dm b/code/modules/mob/living/carbon/human/species/yautja/_species.dm
index f8ecb3e0591b..f8937279d8b9 100644
--- a/code/modules/mob/living/carbon/human/species/yautja/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/yautja/_species.dm
@@ -161,7 +161,7 @@
/datum/species/yautja/post_species_loss(mob/living/carbon/human/H)
..()
- var/datum/mob_hud/medical/advanced/A = huds[MOB_HUD_MEDICAL_ADVANCED]
+ var/datum/mob_hud/medical/advanced/A = GLOB.huds[MOB_HUD_MEDICAL_ADVANCED]
A.add_to_hud(H)
H.blood_type = pick("A+","A-","B+","B-","O-","O+","AB+","AB-")
H.h_style = "Bald"
diff --git a/code/modules/mob/living/carbon/human/species/zombie.dm b/code/modules/mob/living/carbon/human/species/zombie.dm
index 5fa928a67f36..251816c03468 100644
--- a/code/modules/mob/living/carbon/human/species/zombie.dm
+++ b/code/modules/mob/living/carbon/human/species/zombie.dm
@@ -67,7 +67,7 @@
D = zombie.AddDisease(new /datum/disease/black_goo())
D.stage = 5
- var/datum/mob_hud/Hu = huds[MOB_HUD_MEDICAL_OBSERVER]
+ var/datum/mob_hud/Hu = GLOB.huds[MOB_HUD_MEDICAL_OBSERVER]
Hu.add_hud_to(zombie, zombie)
return ..()
@@ -76,7 +76,7 @@
/datum/species/zombie/post_species_loss(mob/living/carbon/human/zombie)
..()
remove_from_revive(zombie)
- var/datum/mob_hud/Hu = huds[MOB_HUD_MEDICAL_OBSERVER]
+ var/datum/mob_hud/Hu = GLOB.huds[MOB_HUD_MEDICAL_OBSERVER]
Hu.remove_hud_from(zombie, zombie)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index fd9c786bd147..7013d28b92b8 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -4,8 +4,8 @@
TODO: Proper documentation
icon_key is [species.race_key][g][husk][fat][hulk][skeleton][ethnicity]
*/
-var/global/list/human_icon_cache = list()
-var/global/list/tail_icon_cache = list()
+GLOBAL_LIST_EMPTY(human_icon_cache)
+GLOBAL_LIST_EMPTY(tail_icon_cache)
/proc/overlay_image(icon, icon_state, color, flags)
var/image/ret = image(icon,icon_state)
@@ -19,7 +19,7 @@ var/global/list/tail_icon_cache = list()
Global associative list for caching uniform masks.
Each index is just 0 or 1 for not removed and removed (as in previously delimbed).
*/
-var/global/list/uniform_mask_cache = list()
+GLOBAL_LIST_EMPTY(uniform_mask_cache)
///////////////////////
//UPDATE_ICONS SYSTEM//
@@ -699,11 +699,11 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate,
/mob/living/carbon/human/proc/get_tail_icon()
var/icon_key = "[species.race_key][r_skin][g_skin][b_skin][r_hair][g_hair][b_hair]"
- var/icon/tail_icon = tail_icon_cache[icon_key]
+ var/icon/tail_icon = GLOB.tail_icon_cache[icon_key]
if(!tail_icon)
//generate a new one
tail_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]")
- tail_icon_cache[icon_key] = tail_icon
+ GLOB.tail_icon_cache[icon_key] = tail_icon
return tail_icon
diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
index d253d8bc0771..ee948b8ef1e0 100644
--- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
@@ -260,7 +260,7 @@
new_xeno.key = picked.key
if(new_xeno.client)
- new_xeno.client.change_view(world_view_size)
+ new_xeno.client.change_view(GLOB.world_view_size)
if(new_xeno.client.prefs?.toggles_flashing & FLASH_POOLSPAWN)
window_flash(new_xeno.client)
@@ -336,17 +336,17 @@
victim.attack_log += "\[[time_stamp()]\] Was chestbursted in [get_area_name(larva_embryo)] at X[victim.x], Y[victim.y], Z[victim.z]. The larva was [key_name(larva_embryo)]."
if(burstcount)
- step(larva_embryo, pick(cardinal))
+ step(larva_embryo, pick(GLOB.cardinals))
- if(round_statistics)
- round_statistics.total_larva_burst++
+ if(GLOB.round_statistics)
+ GLOB.round_statistics.total_larva_burst++
GLOB.larva_burst_by_hive[hive] = (GLOB.larva_burst_by_hive[hive] || 0) + 1
burstcount++
if(!larva_embryo.ckey && larva_embryo.burrowable && loc && is_ground_level(loc.z) && (locate(/obj/structure/bed/nest) in loc) && hive.living_xeno_queen && hive.living_xeno_queen.z == loc.z)
larva_embryo.visible_message(SPAN_XENODANGER("[larva_embryo] quickly burrows into the ground."))
- if(round_statistics && !larva_embryo.statistic_exempt)
- round_statistics.track_new_participant(faction, -1) // keep stats sane
+ if(GLOB.round_statistics && !larva_embryo.statistic_exempt)
+ GLOB.round_statistics.track_new_participant(faction, -1) // keep stats sane
hive.stored_larva++
hive.hive_ui.update_burrowed_larva()
qdel(larva_embryo)
diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm
index 332f8d1778dd..63aa7b09a633 100644
--- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm
@@ -82,7 +82,7 @@
var/mob/living/carbon/xenomorph/M = null
- M = RoleAuthority.get_caste_by_text(castepick)
+ M = GLOB.RoleAuthority.get_caste_by_text(castepick)
if(isnull(M))
to_chat(usr, SPAN_WARNING("[castepick] is not a valid caste! If you're seeing this message, tell a coder!"))
@@ -148,7 +148,7 @@
else
new_xeno.key = src.key
if(new_xeno.client)
- new_xeno.client.change_view(world_view_size)
+ new_xeno.client.change_view(GLOB.world_view_size)
//Regenerate the new mob's name now that our player is inside
new_xeno.generate_name()
@@ -182,8 +182,8 @@
if (new_xeno.client)
new_xeno.client.mouse_pointer_icon = initial(new_xeno.client.mouse_pointer_icon)
- if(new_xeno.mind && round_statistics)
- round_statistics.track_new_participant(new_xeno.faction, -1) //so an evolved xeno doesn't count as two.
+ if(new_xeno.mind && GLOB.round_statistics)
+ GLOB.round_statistics.track_new_participant(new_xeno.faction, -1) //so an evolved xeno doesn't count as two.
SSround_recording.recorder.track_player(new_xeno)
/mob/living/carbon/xenomorph/proc/evolve_checks()
@@ -336,7 +336,7 @@
else
new_xeno.key = key
if(new_xeno.client)
- new_xeno.client.change_view(world_view_size)
+ new_xeno.client.change_view(GLOB.world_view_size)
new_xeno.client.pixel_x = 0
new_xeno.client.pixel_y = 0
@@ -347,8 +347,8 @@
new_xeno.visible_message(SPAN_XENODANGER("A [new_xeno.caste.caste_type] emerges from the husk of \the [src]."), \
SPAN_XENODANGER("You regress into your previous form."))
- if(round_statistics && !new_xeno.statistic_exempt)
- round_statistics.track_new_participant(faction, -1) //so an evolved xeno doesn't count as two.
+ if(GLOB.round_statistics && !new_xeno.statistic_exempt)
+ GLOB.round_statistics.track_new_participant(faction, -1) //so an evolved xeno doesn't count as two.
SSround_recording.recorder.track_player(new_xeno)
src.transfer_observers_to(new_xeno)
diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
index 65ae240e201d..3b715a0e1e72 100644
--- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
@@ -329,8 +329,8 @@
else
target.visible_message(SPAN_DANGER("[src] violates [target]'s face!"))
- if(round_statistics && ishuman(target))
- round_statistics.total_huggers_applied++
+ if(GLOB.round_statistics && ishuman(target))
+ GLOB.round_statistics.total_huggers_applied++
/obj/item/clothing/mask/facehugger/proc/go_active()
if(stat == DEAD)
@@ -523,7 +523,7 @@
/datum/species/yautja/handle_hugger_attachment(mob/living/carbon/human/target, obj/item/clothing/mask/facehugger/hugger)
var/catch_chance = 50
- if(target.dir == reverse_dir[hugger.dir])
+ if(target.dir == GLOB.reverse_dir[hugger.dir])
catch_chance += 20
if(target.lying)
catch_chance -= 50
diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
index 76403bf89f52..2b045a8e5cfd 100644
--- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -501,8 +501,8 @@
var/selected_caste = GLOB.xeno_datum_list[caste_type]?.type
hive.used_slots[selected_caste]++
- if(round_statistics && !statistic_exempt)
- round_statistics.track_new_participant(faction, 1)
+ if(GLOB.round_statistics && !statistic_exempt)
+ GLOB.round_statistics.track_new_participant(faction, 1)
generate_name()
// This can happen if a xeno gets made before the game starts
@@ -797,7 +797,7 @@
//and display them
add_to_all_mob_huds()
- var/datum/mob_hud/MH = huds[MOB_HUD_XENO_INFECTION]
+ var/datum/mob_hud/MH = GLOB.huds[MOB_HUD_XENO_INFECTION]
MH.add_hud_to(src, src)
@@ -1085,7 +1085,7 @@
/mob/living/carbon/xenomorph/handle_blood_splatter(splatter_dir, duration)
var/color_override
if(special_blood)
- var/datum/reagent/D = chemical_reagents_list[special_blood]
+ var/datum/reagent/D = GLOB.chemical_reagents_list[special_blood]
if(D)
color_override = D.color
new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(loc, splatter_dir, duration, color_override)
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
index 705837699275..72d2dc88483b 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
@@ -220,7 +220,7 @@
/mob/living/carbon/xenomorph/proc/zoom_out()
if(!client)
return
- client.change_view(world_view_size)
+ client.change_view(GLOB.world_view_size)
client.pixel_x = 0
client.pixel_y = 0
is_zoomed = 0
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
index 7a8151d8aa02..9f3139fe2599 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
@@ -849,7 +849,7 @@
for(var/mob/living/L in T)
to_chat(L, SPAN_XENOHIGHDANGER("You see a massive ball of acid flying towards you!"))
- for(var/dirn in alldirs)
+ for(var/dirn in GLOB.alldirs)
recursive_spread(get_step(T, dirn), dist_left - 1, orig_depth)
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
index e926349af60d..ad3cfb129f40 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
@@ -257,8 +257,8 @@
var/turf/temp = X.loc
for(var/x in 0 to max_distance)
temp = get_step(T, facing)
- if(facing in diagonals) // check if it goes through corners
- var/reverse_face = reverse_dir[facing]
+ if(facing in GLOB.diagonals) // check if it goes through corners
+ var/reverse_face = GLOB.reverse_dir[facing]
var/turf/back_left = get_step(temp, turn(reverse_face, 45))
var/turf/back_right = get_step(temp, turn(reverse_face, -45))
if((!back_left || back_left.density) && (!back_right || back_right.density))
@@ -973,8 +973,8 @@
var/turf/temp = X.loc
for(var/x in 0 to max_distance)
temp = get_step(T, facing)
- if(facing in diagonals) // check if it goes through corners
- var/reverse_face = reverse_dir[facing]
+ if(facing in GLOB.diagonals) // check if it goes through corners
+ var/reverse_face = GLOB.reverse_dir[facing]
var/turf/back_left = get_step(temp, turn(reverse_face, 45))
var/turf/back_right = get_step(temp, turn(reverse_face, -45))
if((!back_left || back_left.density) && (!back_right || back_right.density))
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
index 65ea443c133c..b489a6382898 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
@@ -102,7 +102,7 @@
else
new_xeno.key = target_xeno.key
if(new_xeno.client)
- new_xeno.client.change_view(world_view_size)
+ new_xeno.client.change_view(GLOB.world_view_size)
new_xeno.client.pixel_x = 0
new_xeno.client.pixel_y = 0
@@ -125,8 +125,8 @@
target_xeno.transfer_observers_to(new_xeno)
- if(round_statistics && !new_xeno.statistic_exempt)
- round_statistics.track_new_participant(target_xeno.faction, -1) //so an evolved xeno doesn't count as two.
+ if(GLOB.round_statistics && !new_xeno.statistic_exempt)
+ GLOB.round_statistics.track_new_participant(target_xeno.faction, -1) //so an evolved xeno doesn't count as two.
SSround_recording.recorder.stop_tracking(target_xeno)
SSround_recording.recorder.track_player(new_xeno)
qdel(target_xeno)
@@ -537,7 +537,7 @@
return
var/obj/effect/alien/weeds/node/node
- for(var/direction in cardinal)
+ for(var/direction in GLOB.cardinals)
var/turf/weed_turf = get_step(T, direction)
var/obj/effect/alien/weeds/W = locate() in weed_turf
if(W && W.hivenumber == X.hivenumber && W.parent && !W.hibernate && !LinkBlocked(W, weed_turf, T))
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm
index cd4533eabc83..23b0468199f0 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm
@@ -170,8 +170,8 @@
for (var/x in 0 to 3)
temp = get_step(T, facing)
- if(facing in diagonals) // check if it goes through corners
- var/reverse_face = reverse_dir[facing]
+ if(facing in GLOB.diagonals) // check if it goes through corners
+ var/reverse_face = GLOB.reverse_dir[facing]
var/turf/back_left = get_step(temp, turn(reverse_face, 45))
var/turf/back_right = get_step(temp, turn(reverse_face, -45))
if((!back_left || back_left.density) && (!back_right || back_right.density))
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm
index f4d4628e41f2..e0d1db45c9a7 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm
@@ -63,8 +63,8 @@
if(!owner)
return
var/mob/living/carbon/xenomorph/X = owner
- if (ability_name && round_statistics)
- round_statistics.track_ability_usage(ability_name)
+ if (ability_name && GLOB.round_statistics)
+ GLOB.round_statistics.track_ability_usage(ability_name)
X.track_ability_usage(ability_name, X.caste_type)
/datum/action/xeno_action/can_use_action()
diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
index 25f6108c14f6..a477d2de97aa 100644
--- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
+++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -767,9 +767,9 @@
to_chat(M, SPAN_XENONOTICE("You interact with the machine and disable remote control."))
xeno_message(SPAN_XENOANNOUNCE("[message]"),3,M.hivenumber)
last_locked = world.time
- if(almayer_orbital_cannon)
- almayer_orbital_cannon.is_disabled = TRUE
- addtimer(CALLBACK(almayer_orbital_cannon, .obj/structure/orbital_cannon/proc/enable), 10 MINUTES, TIMER_UNIQUE)
+ if(GLOB.almayer_orbital_cannon)
+ GLOB.almayer_orbital_cannon.is_disabled = TRUE
+ addtimer(CALLBACK(GLOB.almayer_orbital_cannon, .obj/structure/orbital_cannon/proc/enable), 10 MINUTES, TIMER_UNIQUE)
queen_locked = 1
/datum/shuttle/ferry/marine/proc/door_override(mob/living/carbon/xenomorph/M, shuttle_tag)
@@ -783,17 +783,17 @@
if(shuttle_tag == DROPSHIP_NORMANDY)
ship_id = "sh_dropship2"
- for(var/obj/structure/machinery/door/airlock/dropship_hatch/D in machines)
+ for(var/obj/structure/machinery/door/airlock/dropship_hatch/D in GLOB.machines)
if(D.id == ship_id)
D.unlock()
var/obj/structure/machinery/door/airlock/multi_tile/almayer/reardoor
switch(ship_id)
if("sh_dropship1")
- for(var/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1/D in machines)
+ for(var/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1/D in GLOB.machines)
reardoor = D
if("sh_dropship2")
- for(var/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds2/D in machines)
+ for(var/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds2/D in GLOB.machines)
reardoor = D
if(!reardoor)
CRASH("Shuttle crashed trying to override invalid rear door with shuttle id [ship_id]")
diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm
index 0374b21c6f36..1f7d02f98c7d 100644
--- a/code/modules/mob/living/carbon/xenomorph/death.dm
+++ b/code/modules/mob/living/carbon/xenomorph/death.dm
@@ -116,11 +116,11 @@
hive.remove_xeno(src)
// Finding the last xeno for anti-delay.
if(SSticker.mode && SSticker.current_state != GAME_STATE_FINISHED)
- if((last_ares_callout + 2 MINUTES) > world.time)
+ if((GLOB.last_ares_callout + 2 MINUTES) > world.time)
return
if(hive.hivenumber == XENO_HIVE_NORMAL && (LAZYLEN(hive.totalXenos) == 1))
var/mob/living/carbon/xenomorph/X = LAZYACCESS(hive.totalXenos, 1)
- last_ares_callout = world.time
+ GLOB.last_ares_callout = world.time
// Tell the marines where the last one is.
var/name = "[MAIN_AI_SYSTEM] Bioscan Status"
var/input = "Bioscan complete.\n\nSensors indicate one remaining unknown lifeform signature in [get_area(X)]."
diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/crusher/charger.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/crusher/charger.dm
index f7daee71df38..b455cbf9e0a4 100644
--- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/crusher/charger.dm
+++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/crusher/charger.dm
@@ -385,8 +385,8 @@
if(HAS_TRAIT(src, TRAIT_CHARGING))
apply_effect(2, WEAKEN)
xeno.apply_effect(2, WEAKEN)
- src.throw_atom(pick(cardinal),1,3,xeno,TRUE)
- xeno.throw_atom(pick(cardinal),1,3,xeno,TRUE)
+ src.throw_atom(pick(GLOB.cardinals),1,3,xeno,TRUE)
+ xeno.throw_atom(pick(GLOB.cardinals),1,3,xeno,TRUE)
charger_ability.stop_momentum() // We assume the other crusher'sparks handle_charge_collision() kicks in and stuns us too.
playsound(get_turf(xeno), 'sound/effects/bang.ogg', 25, 0)
return
diff --git a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm
index 3bfb4e355416..793ed45bcb13 100644
--- a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm
+++ b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm
@@ -196,7 +196,7 @@ GLOBAL_VAR_INIT(resin_lz_allowed, FALSE)
return FALSE
var/wall_support = FALSE
- for(var/D in cardinal)
+ for(var/D in GLOB.cardinals)
var/turf/CT = get_step(T, D)
if(CT)
if(CT.density)
diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm
index d1832d10b6fe..a2413b766505 100644
--- a/code/modules/mob/living/carbon/xenomorph/say.dm
+++ b/code/modules/mob/living/carbon/xenomorph/say.dm
@@ -1,7 +1,7 @@
/mob/living/carbon/xenomorph/say(message)
var/verb = "says"
var/forced = 0
- var/message_range = world_view_size
+ var/message_range = GLOB.world_view_size
if(client)
if(client.prefs.muted & MUTE_IC)
diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
index 30e78a5fed94..28a84803a8e1 100644
--- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm
+++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
@@ -300,7 +300,7 @@
/atom/movable/vis_obj/xeno_pack/Initialize(mapload, mob/living/carbon/source)
. = ..()
if(source)
- icon = default_xeno_onmob_icons[source.type]
+ icon = GLOB.default_xeno_onmob_icons[source.type]
//Xeno Overlays Indexes//////////
#undef X_BACK_LAYER
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index f1fff4fb765e..7e24ac6e5f9a 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -166,7 +166,7 @@
var/total_xeno_playtime = 0
- for(var/caste in RoleAuthority.castes_by_name)
+ for(var/caste in GLOB.RoleAuthority.castes_by_name)
total_xeno_playtime += get_job_playtime(src, caste)
total_xeno_playtime += get_job_playtime(src, JOB_XENOMORPH)
@@ -187,7 +187,7 @@
var/list/drone_evo_castes = list(XENO_CASTE_DRONE, XENO_CASTE_CARRIER, XENO_CASTE_BURROWER, XENO_CASTE_HIVELORD, XENO_CASTE_QUEEN)
- for(var/caste in RoleAuthority.castes_by_name)
+ for(var/caste in GLOB.RoleAuthority.castes_by_name)
if(!(caste in drone_evo_castes))
continue
total_drone_playtime += get_job_playtime(src, caste)
@@ -198,8 +198,8 @@
/client/proc/get_total_t3_playtime()
var/total_t3_playtime = 0
var/datum/caste_datum/caste
- for(var/caste_name in RoleAuthority.castes_by_name)
- caste = RoleAuthority.castes_by_name[caste_name]
+ for(var/caste_name in GLOB.RoleAuthority.castes_by_name)
+ caste = GLOB.RoleAuthority.castes_by_name[caste_name]
if(caste.tier < 3)
continue
total_t3_playtime += get_job_playtime(src, caste_name)
@@ -944,12 +944,12 @@
for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list)
if(!(isspecieshuman(current_human) || isspeciessynth(current_human)))
continue
- var/datum/job/job = RoleAuthority.roles_for_mode[current_human.job]
+ var/datum/job/job = GLOB.RoleAuthority.roles_for_mode[current_human.job]
if(!job)
continue
var/turf/turf = get_turf(current_human)
if(is_mainship_level(turf?.z))
- shipside_humans_weighted_count += RoleAuthority.calculate_role_weight(job)
+ shipside_humans_weighted_count += GLOB.RoleAuthority.calculate_role_weight(job)
hijack_burrowed_surge = TRUE
hijack_burrowed_left = max(n_ceil(shipside_humans_weighted_count * 0.5) - xenos_count, 5)
hivecore_cooldown = FALSE
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm
index 94218b224e2d..dd722f62df63 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm
@@ -81,7 +81,7 @@
set desc = "Toggles the health and plasma HUD appearing above Xenomorphs."
set category = "Alien"
- var/datum/mob_hud/H = huds[MOB_HUD_XENO_STATUS]
+ var/datum/mob_hud/H = GLOB.huds[MOB_HUD_XENO_STATUS]
if (xeno_mobhud)
H.remove_hud_from(usr, usr)
else
@@ -94,7 +94,7 @@
set desc = "Toggles the HUD that renders various negative status effects inflicted on humans."
set category = "Alien"
- var/datum/mob_hud/H = huds[MOB_HUD_XENO_HOSTILE]
+ var/datum/mob_hud/H = GLOB.huds[MOB_HUD_XENO_HOSTILE]
if (xeno_hostile_hud)
H.remove_hud_from(usr, usr)
else
diff --git a/code/modules/mob/living/living_helpers.dm b/code/modules/mob/living/living_helpers.dm
index 7650995f102c..8d5a469c1b4d 100644
--- a/code/modules/mob/living/living_helpers.dm
+++ b/code/modules/mob/living/living_helpers.dm
@@ -23,7 +23,7 @@
return
if(!direction)
- direction = pick(alldirs)
+ direction = pick(GLOB.alldirs)
var/turf/target_turf = get_turf(src)
var/turf/temporary_turf = get_turf(src)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 45eb43c91773..36ae23587a28 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -1,4 +1,4 @@
-var/list/department_radio_keys = list(
+GLOBAL_LIST_INIT(department_radio_keys, list(
":i" = RADIO_CHANNEL_INTERCOM, ".i" = RADIO_CHANNEL_INTERCOM, "#i" = RADIO_CHANNEL_INTERCOM,
":h" = RADIO_CHANNEL_DEPARTMENT, ".h" = RADIO_CHANNEL_DEPARTMENT, "#h" = RADIO_CHANNEL_DEPARTMENT,
":w" = RADIO_MODE_WHISPER, ".w" = RADIO_MODE_WHISPER, "#w" = RADIO_MODE_WHISPER,
@@ -49,18 +49,18 @@ var/list/department_radio_keys = list(
":K" = SQUAD_SOF, ".K" = SQUAD_SOF, "#K" = RADIO_CHANNEL_WY_WO,
":Q" = RADIO_CHANNEL_ROYAL_MARINE, ".Q" = RADIO_CHANNEL_ROYAL_MARINE,
":R" = RADIO_CHANNEL_PROVOST, ".R" = RADIO_CHANNEL_PROVOST, "#R" = RADIO_CHANNEL_PROVOST,
-)
+))
/proc/channel_to_prefix(channel)
var/channel_key
- for(var/key in department_radio_keys)
- if(department_radio_keys[key] == channel)
+ for(var/key in GLOB.department_radio_keys)
+ if(GLOB.department_radio_keys[key] == channel)
channel_key = key
break
return channel_key
/proc/prefix_to_channel(prefix)
- return department_radio_keys[prefix]
+ return GLOB.department_radio_keys[prefix]
///Shows custom speech bubbles for screaming, *warcry etc.
/mob/living/proc/show_speech_bubble(bubble_name, bubble_type = bubble_icon)
@@ -76,7 +76,7 @@ var/list/department_radio_keys = list(
/mob/living/proc/remove_speech_bubble(mutable_appearance/speech_bubble, list_of_mobs)
overlays -= speech_bubble
-/mob/living/say(message, datum/language/speaking = null, verb="says", alt_name="", italics=0, message_range = world_view_size, sound/speech_sound, sound_vol, nolog = 0, message_mode = null, bubble_type = bubble_icon)
+/mob/living/say(message, datum/language/speaking = null, verb="says", alt_name="", italics=0, message_range = GLOB.world_view_size, sound/speech_sound, sound_vol, nolog = 0, message_mode = null, bubble_type = bubble_icon)
var/turf/T
if(SEND_SIGNAL(src, COMSIG_LIVING_SPEAK, message, speaking, verb, alt_name, italics, message_range, speech_sound, sound_vol, nolog, message_mode) & COMPONENT_OVERRIDE_SPEAK) return
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index cf734a09ae0d..0cd43361e22a 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -1,8 +1,8 @@
#define AI_CHECK_WIRELESS 1
#define AI_CHECK_RADIO 2
-var/list/ai_list = list()
-var/list/ai_verbs_default = list(
+GLOBAL_LIST_EMPTY(ai_list)
+GLOBAL_LIST_INIT(ai_verbs_default, list(
/mob/living/silicon/ai/proc/ai_alerts,
/mob/living/silicon/ai/proc/ai_announcement,
// /mob/living/silicon/ai/proc/ai_recall_shuttle,
@@ -17,7 +17,7 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/proc/pick_icon,
/mob/living/silicon/ai/proc/sensor_mode,
/mob/living/silicon/ai/proc/toggle_acceleration
-)
+))
//mob/living/silicon/ai/proc/ai_hologram_change,
@@ -30,7 +30,7 @@ var/list/ai_verbs_default = list(
/proc/AutoUpdateAI(obj/subject)
var/is_in_use = 0
if (subject!=null)
- for(var/A in ai_list)
+ for(var/A in GLOB.ai_list)
var/mob/living/silicon/ai/M = A
if ((M.client && M.interactee == subject))
is_in_use = 1
@@ -82,17 +82,17 @@ var/list/ai_verbs_default = list(
var/datum/announcement/priority/announcement
/mob/living/silicon/ai/proc/add_ai_verbs()
- add_verb(src, ai_verbs_default)
+ add_verb(src, GLOB.ai_verbs_default)
/mob/living/silicon/ai/proc/remove_ai_verbs()
- remove_verb(src, ai_verbs_default)
+ remove_verb(src, GLOB.ai_verbs_default)
/mob/living/silicon/ai/New(loc, obj/item/device/mmi/B, safety = 0)
- var/list/possibleNames = ai_names
+ var/list/possibleNames = GLOB.ai_names
var/pickedName = null
while(!pickedName)
- pickedName = pick(ai_names)
+ pickedName = pick(GLOB.ai_names)
for (var/mob/living/silicon/ai/A in GLOB.mob_list)
if (A.real_name == pickedName && possibleNames.len > 1) //fixing the theoretically possible infinite loop
possibleNames -= pickedName
@@ -143,12 +143,12 @@ var/list/ai_verbs_default = list(
spawn(5)
new /obj/structure/machinery/ai_powersupply(src)
- ai_list += src
+ GLOB.ai_list += src
..()
return
/mob/living/silicon/ai/Destroy()
- ai_list -= src
+ GLOB.ai_list -= src
QDEL_NULL(aiMulti)
if(aiRadio)
aiRadio.myAi = null
@@ -315,7 +315,7 @@ var/list/ai_verbs_default = list(
unset_interaction()
src << browse(null, t1)
if (href_list["switchcamera"])
- switchCamera(locate(href_list["switchcamera"])) in cameranet.cameras
+ switchCamera(locate(href_list["switchcamera"])) in GLOB.cameranet.cameras
if (href_list["showalerts"])
ai_alerts()
//Carn: holopad requests
@@ -422,11 +422,11 @@ var/list/ai_verbs_default = list(
var/mob/living/silicon/ai/U = usr
- for (var/obj/structure/machinery/camera/C in cameranet.cameras)
+ for (var/obj/structure/machinery/camera/C in GLOB.cameranet.cameras)
if(!C.can_use())
continue
- var/list/tempnetwork = difflist(C.network,RESTRICTED_CAMERA_NETWORKS,1)
+ var/list/tempnetwork = difflist(C.network,GLOB.RESTRICTED_CAMERA_NETWORKS,1)
if(tempnetwork.len)
for(var/i in tempnetwork)
cameralist[i] = i
@@ -440,7 +440,7 @@ var/list/ai_verbs_default = list(
if(isnull(network))
network = old_network // If nothing is selected
else
- for(var/obj/structure/machinery/camera/C in cameranet.cameras)
+ for(var/obj/structure/machinery/camera/C in GLOB.cameranet.cameras)
if(!C.can_use())
continue
if(network in C.network)
@@ -458,7 +458,7 @@ var/list/ai_verbs_default = list(
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Surprised", "Sad", "Upset", "Angry", "Awesome", "BSOD", "Blank", "Problems?", "Facepalm", "Friend Computer")
var/emote = tgui_input_list(usr, "Please, select a status!", "AI Status", ai_emotions)
- for (var/obj/structure/machinery/M in machines) //change status
+ for (var/obj/structure/machinery/M in GLOB.machines) //change status
if(istype(M, /obj/structure/machinery/ai_status_display))
var/obj/structure/machinery/ai_status_display/AISD = M
AISD.emotion = emote
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 19a6267518c3..1555fc9c2b7b 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -13,7 +13,7 @@
if(explosive)
addtimer(CALLBACK(src, PROC_REF(explosion), src.loc, 3, 6, 12, 15), 10)
- for(var/obj/structure/machinery/ai_status_display/O in machines)
+ for(var/obj/structure/machinery/ai_status_display/O in GLOB.machines)
spawn( 0 )
O.mode = 2
if (istype(loc, /obj/item/device/aicard))
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index d6eb167e1677..808ad653b73c 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -2,7 +2,7 @@
//
// The datum containing all the chunks.
-var/datum/cameranet/cameranet = new()
+GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new())
/datum/cameranet
// The cameras on the map, no matter if they work or not. Updated in obj/structure/machinery/camera/New() and Dispose().
@@ -142,7 +142,7 @@ var/datum/cameranet/cameranet = new()
/turf/verb/view_chunk()
set src in world
- if(cameranet.chunkGenerated(x, y, z))
- var/datum/camerachunk/chunk = cameranet.getCameraChunk(x, y, z)
+ if(GLOB.cameranet.chunkGenerated(x, y, z))
+ var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(x, y, z)
usr.client.debug_variables(chunk)
*/
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 5fe03ffa272c..22e2bf05aa2c 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -30,7 +30,7 @@
T = get_turf(T)
forceMove(T)
- cameranet.visibility(src)
+ GLOB.cameranet.visibility(src)
if(ai.client)
ai.client.eye = src
//Holopad
diff --git a/code/modules/mob/living/silicon/ai/freelook/read_me.dm b/code/modules/mob/living/silicon/ai/freelook/read_me.dm
index 4d255772981e..5bfa5810a725 100644
--- a/code/modules/mob/living/silicon/ai/freelook/read_me.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/read_me.dm
@@ -43,7 +43,7 @@ sight; for example, we don't update glass airlocks or floors.
WHERE IS EVERYTHING?
-cameranet.dm = Everything about the cameranet datum.
+GLOB.cameranet.dm = Everything about the cameranet datum.
chunk.dm = Everything about the chunk datum.
eye.dm = Everything about the AI and the AIEye.
updating.dm = Everything about triggers that will update chunks.
diff --git a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
index a7109f491740..7ecaab1c3e79 100644
--- a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
@@ -9,47 +9,47 @@
/turf/proc/visibilityChanged()
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
/obj/structure/machinery/door/poddoor/shutters/open()
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
. = ..()
/obj/structure/machinery/door/poddoor/shutters/close()
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
. = ..()
/obj/structure/machinery/door/poddoor/shutters/Destroy()
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
. = ..()
// STRUCTURES
/obj/structure/Destroy(force)
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
. = ..()
/obj/structure/Initialize(mapload, ...)
. = ..()
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
// EFFECTS
/obj/effect/Destroy()
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
. = ..()
/obj/effect/Initialize(mapload, ...)
. = ..()
if(z && SSatoms.initialized != INITIALIZATION_INSSATOMS)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
@@ -68,7 +68,7 @@
updating = 1
spawn(BORG_CAMERA_BUFFER)
if(oldLoc != src.loc)
- cameranet.updatePortableCamera(src.camera)
+ GLOB.cameranet.updatePortableCamera(src.camera)
updating = 0
/mob/living/carbon/human/var/updating = 0
@@ -85,7 +85,7 @@
updating = TRUE
spawn(BORG_CAMERA_BUFFER)
if (oldLoc != loc)
- cameranet.updatePortableCamera(H.camera)
+ GLOB.cameranet.updatePortableCamera(H.camera)
updating = FALSE
// CAMERA
@@ -95,23 +95,23 @@
/obj/structure/machinery/camera/toggle_cam_status(mob/user, silent)
..()
if(can_use())
- cameranet.addCamera(src)
+ GLOB.cameranet.addCamera(src)
else
set_light(0)
- cameranet.removeCamera(src)
+ GLOB.cameranet.removeCamera(src)
/obj/structure/machinery/camera/Initialize()
. = ..()
- cameranet.cameras += src //Camera must be added to global list of all cameras no matter what...
- var/list/open_networks = difflist(network,RESTRICTED_CAMERA_NETWORKS) //...but if all of camera's networks are restricted, it only works for specific camera consoles.
+ GLOB.cameranet.cameras += src //Camera must be added to global list of all cameras no matter what...
+ var/list/open_networks = difflist(network,GLOB.RESTRICTED_CAMERA_NETWORKS) //...but if all of camera's networks are restricted, it only works for specific camera consoles.
if(open_networks.len) //If there is at least one open network, chunk is available for AI usage.
- cameranet.addCamera(src)
+ GLOB.cameranet.addCamera(src)
/obj/structure/machinery/camera/Destroy()
- cameranet.cameras -= src
- var/list/open_networks = difflist(network,RESTRICTED_CAMERA_NETWORKS)
+ GLOB.cameranet.cameras -= src
+ var/list/open_networks = difflist(network,GLOB.RESTRICTED_CAMERA_NETWORKS)
if(open_networks.len)
- cameranet.removeCamera(src)
+ GLOB.cameranet.removeCamera(src)
. = ..()
//#undef BORG_CAMERA_BUFFER
diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm
index 91bcd76b2eb5..7a8d6ba9585f 100644
--- a/code/modules/mob/living/silicon/ai/login.dm
+++ b/code/modules/mob/living/silicon/ai/login.dm
@@ -3,7 +3,7 @@
regenerate_icons()
if(stat != DEAD)
- for(var/obj/structure/machinery/ai_status_display/O in machines) //change status
+ for(var/obj/structure/machinery/ai_status_display/O in GLOB.machines) //change status
O.mode = 1
O.emotion = "Neutral"
src.view_core()
diff --git a/code/modules/mob/living/silicon/ai/logout.dm b/code/modules/mob/living/silicon/ai/logout.dm
index efc03f575ec8..62964915c33a 100644
--- a/code/modules/mob/living/silicon/ai/logout.dm
+++ b/code/modules/mob/living/silicon/ai/logout.dm
@@ -1,6 +1,6 @@
/mob/living/silicon/ai/Logout()
..()
- for(var/obj/structure/machinery/ai_status_display/O in machines) //change status
+ for(var/obj/structure/machinery/ai_status_display/O in GLOB.machines) //change status
O.mode = 0
if(!isturf(loc))
if (client)
diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm
index b625b19b172d..a58f870b4a7d 100644
--- a/code/modules/mob/living/silicon/decoy/decoy.dm
+++ b/code/modules/mob/living/silicon/decoy/decoy.dm
@@ -21,7 +21,7 @@
name = MAIN_AI_SYSTEM
desc = "This is the artificial intelligence system for the [MAIN_SHIP_NAME]. Like many other military-grade AI systems, this one was manufactured by Weyland-Yutani."
ai_headset = new(src)
- ai_mob_list += src
+ GLOB.ai_mob_list += src
real_name = MAIN_AI_SYSTEM
/mob/living/silicon/decoy/ship_ai/Destroy()
@@ -76,7 +76,7 @@
if(length(message) >= 2)
var/channel_prefix = copytext(message, 1 ,3)
- channel_prefix = department_radio_keys[channel_prefix]
+ channel_prefix = GLOB.department_radio_keys[channel_prefix]
if(channel_prefix) return channel_prefix
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 1fa07ae0bc85..6bb01661fbd5 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -182,7 +182,7 @@
/mob/living/silicon/robot/drone/proc/transfer_personality(client/player)
if(!player) return
- player.change_view(world_view_size)
+ player.change_view(GLOB.world_view_size)
src.ckey = player.ckey
if(player.mob && player.mob.mind)
@@ -236,7 +236,7 @@
spawn(0)
var/newname
- newname = tgui_input_list(src,"You are drone. Pick a name, no duplicates allowed.", "Drone name pick", greek_letters)
+ newname = tgui_input_list(src,"You are drone. Pick a name, no duplicates allowed.", "Drone name pick", GLOB.greek_letters)
if(custom_name)
return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index 7909ff05f603..261e6ffc7623 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -4,7 +4,7 @@
set desc = "Tag yourself for delivery through the disposals system."
set category = "Drone"
- var/new_tag = tgui_input_list(usr, "Select the desired destination.", "Set Mail Tag", null, tagger_locations)
+ var/new_tag = tgui_input_list(usr, "Select the desired destination.", "Set Mail Tag", null, GLOB.tagger_locations)
if(!new_tag)
mail_destination = ""
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index 2be09d46da9f..2433720d23c1 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -55,7 +55,7 @@
if (href_list["setarea"])
//Probably should consider using another list, but this one will do.
- var/t_area = tgui_input_list(usr, "Select the area to ping.", "Set Target Area", null, tagger_locations)
+ var/t_area = tgui_input_list(usr, "Select the area to ping.", "Set Target Area", null, GLOB.tagger_locations)
if(!t_area)
return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4ad29179daec..7a3ed2868389 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1,6 +1,6 @@
-var/list/robot_verbs_default = list(
+GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/proc/sensor_mode
-)
+))
#define CYBORG_POWER_USAGE_MULTIPLIER 2.5 // Multiplier for amount of power cyborgs use.
@@ -871,7 +871,7 @@ var/list/robot_verbs_default = list(
//Disconnect it's camera so it's not so easily tracked.
if(src.camera)
src.camera.network = list()
- cameranet.removeCamera(src.camera)
+ GLOB.cameranet.removeCamera(src.camera)
/mob/living/silicon/robot/proc/ResetSecurityCodes()
@@ -933,10 +933,10 @@ var/list/robot_verbs_default = list(
toggle_sensor_mode()
/mob/living/silicon/robot/proc/add_robot_verbs()
- add_verb(src, robot_verbs_default)
+ add_verb(src, GLOB.robot_verbs_default)
/mob/living/silicon/robot/proc/remove_robot_verbs()
- remove_verb(src, robot_verbs_default)
+ remove_verb(src, GLOB.robot_verbs_default)
// Uses power from cyborg's cell. Returns 1 on success or 0 on failure.
// Properly converts using CELLRATE now! Amount is in Joules.
diff --git a/code/modules/mob/living/silicon/robot/wires.dm b/code/modules/mob/living/silicon/robot/wires.dm
index ea09fe5985a4..62d05abe6e13 100644
--- a/code/modules/mob/living/silicon/robot/wires.dm
+++ b/code/modules/mob/living/silicon/robot/wires.dm
@@ -7,9 +7,9 @@
/proc/RandomBorgWires()
//to make this not randomize the wires, just set index to 1 and increment it in the flag for loop (after doing everything else).
var/list/Borgwires = list(0, 0, 0, 0, 0)
- BorgIndexToFlag = list(0, 0, 0, 0, 0)
- BorgIndexToWireColor = list(0, 0, 0, 0, 0)
- BorgWireColorToIndex = list(0, 0, 0, 0, 0)
+ GLOB.BorgIndexToFlag = list(0, 0, 0, 0, 0)
+ GLOB.BorgIndexToWireColor = list(0, 0, 0, 0, 0)
+ GLOB.BorgWireColorToIndex = list(0, 0, 0, 0, 0)
var/flagIndex = 1
//I think it's easier to read this way, also doesn't rely on the random number generator to land on a new wire.
var/list/colorIndexList = list(BORG_WIRE_LAWCHECK, BORG_WIRE_MAIN_POWER1, BORG_WIRE_MAIN_POWER2, BORG_WIRE_AI_CONTROL, BORG_WIRE_CAMERA)
@@ -17,25 +17,25 @@
var/colorIndex = pick(colorIndexList)
if (Borgwires[colorIndex]==0)
Borgwires[colorIndex] = flag
- BorgIndexToFlag[flagIndex] = flag
- BorgIndexToWireColor[flagIndex] = colorIndex
- BorgWireColorToIndex[colorIndex] = flagIndex
+ GLOB.BorgIndexToFlag[flagIndex] = flag
+ GLOB.BorgIndexToWireColor[flagIndex] = colorIndex
+ GLOB.BorgWireColorToIndex[colorIndex] = flagIndex
colorIndexList -= colorIndex // Shortens the list.
//world.log << "Flag: [flag], CIndex: [colorIndex], FIndex: [flagIndex]"
flagIndex+=1
return Borgwires
/mob/living/silicon/robot/proc/isWireColorCut(wireColor)
- var/wireFlag = BorgWireColorToFlag[wireColor]
+ var/wireFlag = GLOB.BorgWireColorToFlag[wireColor]
return ((src.borgwires & wireFlag) == 0)
/mob/living/silicon/robot/proc/isWireCut(wireIndex)
- var/wireFlag = BorgIndexToFlag[wireIndex]
+ var/wireFlag = GLOB.BorgIndexToFlag[wireIndex]
return ((src.borgwires & wireFlag) == 0)
/mob/living/silicon/robot/proc/cut(wireColor)
- var/wireFlag = BorgWireColorToFlag[wireColor]
- var/wireIndex = BorgWireColorToIndex[wireColor]
+ var/wireFlag = GLOB.BorgWireColorToFlag[wireColor]
+ var/wireIndex = GLOB.BorgWireColorToIndex[wireColor]
borgwires &= ~wireFlag
switch(wireIndex)
if(BORG_WIRE_LAWCHECK) //Cut the law wire, and the borg will no longer receive law updates from its AI
@@ -52,8 +52,8 @@
src.interact(usr)
/mob/living/silicon/robot/proc/mend(wireColor)
- var/wireFlag = BorgWireColorToFlag[wireColor]
- var/wireIndex = BorgWireColorToIndex[wireColor]
+ var/wireFlag = GLOB.BorgWireColorToFlag[wireColor]
+ var/wireIndex = GLOB.BorgWireColorToIndex[wireColor]
borgwires |= wireFlag
switch(wireIndex)
if(BORG_WIRE_LAWCHECK) //turns law updates back on assuming the borg hasn't been emagged
@@ -67,7 +67,7 @@
/mob/living/silicon/robot/proc/pulse(wireColor)
- var/wireIndex = BorgWireColorToIndex[wireColor]
+ var/wireIndex = GLOB.BorgWireColorToIndex[wireColor]
switch(wireIndex)
if(BORG_WIRE_LAWCHECK) //Forces a law update if the borg is set to receive them. Since an update would happen when the borg checks its laws anyway, not much use, but eh
if (src.lawupdate)
@@ -96,7 +96,7 @@
"Blue" = 5,
)
for(var/wiredesc in Borgwires)
- var/is_uncut = src.borgwires & BorgWireColorToFlag[Borgwires[wiredesc]]
+ var/is_uncut = src.borgwires & GLOB.BorgWireColorToFlag[Borgwires[wiredesc]]
t1 += "[wiredesc] wire: "
if(!is_uncut)
t1 += "Mend"
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 1638b0fb7fbe..7f95e3d695b5 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -148,12 +148,12 @@
var/HUD_nbr = 1
switch(hud_choice)
if("Medical HUD")
- H = huds[MOB_HUD_MEDICAL_OBSERVER]
+ H = GLOB.huds[MOB_HUD_MEDICAL_OBSERVER]
if("Security HUD")
- H = huds[MOB_HUD_SECURITY_ADVANCED]
+ H = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
HUD_nbr = 2
if("Squad HUD")
- H = huds[MOB_HUD_FACTION_USCM]
+ H = GLOB.huds[MOB_HUD_FACTION_USCM]
HUD_nbr = 3
else
return
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index c10d4f8327a0..268825288198 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -209,8 +209,8 @@
new /mob/living/simple_animal/chicken(src.loc)
qdel(src)
-var/const/MAX_CHICKENS = 50
-var/global/chicken_count = 0
+GLOBAL_VAR_INIT(MAX_CHICKENS, 50)
+GLOBAL_VAR_INIT(chicken_count, 0)
/mob/living/simple_animal/chicken
name = "\improper chicken"
@@ -244,7 +244,7 @@ var/global/chicken_count = 0
icon_dead = "chicken_[body_color]_dead"
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
- chicken_count++
+ GLOB.chicken_count++
/mob/living/simple_animal/chicken/initialize_pass_flags(datum/pass_flags_container/PF)
..()
@@ -253,7 +253,7 @@ var/global/chicken_count = 0
/mob/living/simple_animal/chicken/death()
..()
- chicken_count--
+ GLOB.chicken_count--
if(last_damage_data)
var/mob/user = last_damage_data.resolve_mob()
if(user)
@@ -282,7 +282,7 @@ var/global/chicken_count = 0
var/obj/item/reagent_container/food/snacks/egg/E = new(get_turf(src))
E.pixel_x = rand(-6,6)
E.pixel_y = rand(-6,6)
- if(chicken_count < MAX_CHICKENS && prob(10))
+ if(GLOB.chicken_count < GLOB.MAX_CHICKENS && prob(10))
START_PROCESSING(SSobj, E)
/obj/item/reagent_container/food/snacks/egg/var/amount_grown = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index f693574349d7..1e1c15d173b7 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -138,7 +138,7 @@
src.mind = M.brainmob.mind
src.mind.key = M.brainmob.key
src.ckey = M.brainmob.ckey
- if(client) client.change_view(world_view_size)
+ if(client) client.change_view(GLOB.world_view_size)
src.name = "Spider-bot ([M.brainmob.name])"
/mob/living/simple_animal/spiderbot/proc/explode(cause = "exploding") //When emagged.
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index b47b14f0d1d5..9d0dfc869d8c 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -145,9 +145,9 @@
/mob/living/simple_animal/hostile/proc/DestroySurroundings()
if(prob(break_stuff_probability))
- for(var/dir in cardinal) // North, South, East, West
+ for(var/dir in GLOB.cardinals) // North, South, East, West
for(var/obj/structure/window/obstacle in get_step(src, dir))
- if(obstacle.dir == reverse_dir[dir]) // So that windows get smashed in the right order
+ if(obstacle.dir == GLOB.reverse_dir[dir]) // So that windows get smashed in the right order
obstacle.attack_animal(src)
return
var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 0f15bd1d8f7b..a5109685e41b 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -54,7 +54,7 @@
var/parrot_sleep_dur = 25 //Same as above, this is the var that physically counts down
var/parrot_dam_zone = list("chest", "head", "l_arm", "l_leg", "r_arm", "r_leg") //For humans, select a bodypart to attack
- var/parrot_speed = 5 //"Delay in machines ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower.
+ var/parrot_speed = 5 //"Delay in GLOB.machines ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower.
var/parrot_been_shot = 0 //Parrots get a speed bonus after being shot. This will deincrement every Life() and at 0 the parrot will return to regular speed.
var/list/speech_buffer = list()
@@ -146,7 +146,7 @@
ears.forceMove(src.loc)
ears = null
for(var/possible_phrase in speak)
- if(copytext(possible_phrase,1,3) in department_radio_keys)
+ if(copytext(possible_phrase,1,3) in GLOB.department_radio_keys)
possible_phrase = copytext(possible_phrase,3,length(possible_phrase))
else
to_chat(usr, SPAN_DANGER("There is nothing to remove from its [remove_from]."))
@@ -332,7 +332,7 @@
if(prob(50))
useradio = 1
- if(copytext(possible_phrase,1,3) in department_radio_keys)
+ if(copytext(possible_phrase,1,3) in GLOB.department_radio_keys)
possible_phrase = "[useradio?pick(available_channels):""] [copytext(possible_phrase,3,length(possible_phrase)+1)]" //crop out the channel prefix
else
possible_phrase = "[useradio?pick(available_channels):""] [possible_phrase]"
@@ -341,7 +341,7 @@
else //If we have no headset or channels to use, dont try to use any!
for(var/possible_phrase in speak)
- if(copytext(possible_phrase,1,3) in department_radio_keys)
+ if(copytext(possible_phrase,1,3) in GLOB.department_radio_keys)
possible_phrase = "[copytext(possible_phrase,3,length(possible_phrase)+1)]" //crop out the channel prefix
newspeak.Add(possible_phrase)
speak = newspeak
@@ -363,7 +363,7 @@
//Wander around aimlessly. This will help keep the loops from searches down
//and possibly move the mob into a new are in view of something they can use
if(prob(90))
- step(src, pick(cardinal))
+ step(src, pick(GLOB.cardinals))
return
if(!held_item && !parrot_perch) //If we've got nothing to do... look for something to do.
@@ -713,7 +713,7 @@
if(length(message) >= 2)
var/channel_prefix = copytext(message, 1 ,3)
- message_mode = department_radio_keys[channel_prefix]
+ message_mode = GLOB.department_radio_keys[channel_prefix]
if(copytext(message,1,2) == ":")
var/positioncut = 3
@@ -722,7 +722,7 @@
message = capitalize(trim_left(message))
if(message_mode)
- if(message_mode in radiochannels)
+ if(message_mode in GLOB.radiochannels)
if(ears && istype(ears,/obj/item/device/radio))
ears.talk_into(src,message, message_mode, verb, null)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 8b1cc1e26be2..e18d8e8f066f 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -104,7 +104,7 @@
turns_since_move++
if(turns_since_move >= turns_per_move)
if(!(stop_automated_movement_when_pulled && pulledby)) //Soma animals don't move when pulled
- var/move_dir = pick(cardinal)
+ var/move_dir = pick(GLOB.cardinals)
Move(get_step(src, move_dir ))
setDir(move_dir)
turns_since_move = 0
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index 3f65e01e917c..839645f1084c 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -1,6 +1,6 @@
/mob/Logout()
SEND_SIGNAL(src, COMSIG_MOB_LOGOUT)
- nanomanager.user_logout(src) // this is used to clean up (remove) this user's Nano UIs
+ SSnano.nanomanager.user_logout(src) // this is used to clean up (remove) this user's Nano UIs
if(interactee)
unset_interaction()
GLOB.player_list -= src
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 73c0bdc50147..bb96438e9e61 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -54,8 +54,8 @@
if(!faction_group)
faction_group = list(faction)
- last_mob_gid++
- gid = last_mob_gid
+ GLOB.last_mob_gid++
+ gid = GLOB.last_mob_gid
GLOB.mob_list += src
if(stat == DEAD)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 56951097a12c..3aab10954ea8 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -29,7 +29,7 @@
//TODO: Integrate defence zones and targeting body parts with the actual organ system, move these into organ definitions.
/// The base miss chance for the different defence zones
-var/list/global/base_miss_chance = list(
+GLOBAL_LIST_INIT(base_miss_chance, list(
"head" = 10,
"chest" = 0,
"groin" = 5,
@@ -43,11 +43,11 @@ var/list/global/base_miss_chance = list(
"r_foot" = 40,
"eyes" = 20,
"mouth" = 15,
-)
+))
//Used to weight organs when an organ is hit randomly (i.e. not a directed, aimed attack).
//Also used to weight the protection value that armor provides for covering that body part when calculating protection from full-body effects.
-var/list/global/organ_rel_size = list(
+GLOBAL_LIST_INIT(organ_rel_size, list(
"head" = 15,
"chest" = 70,
"groin" = 30,
@@ -61,10 +61,10 @@ var/list/global/organ_rel_size = list(
"r_foot" = 10,
"eyes" = 5,
"mouth" = 15,
-)
+))
// This is much faster than a string comparison
-var/global/list/limb_types_by_name = list(
+GLOBAL_LIST_INIT(limb_types_by_name, list(
"head" = /obj/limb/head,
"chest" = /obj/limb/chest,
"groin" = /obj/limb/groin,
@@ -76,7 +76,7 @@ var/global/list/limb_types_by_name = list(
"r_hand" = /obj/limb/hand/r_hand,
"l_foot" = /obj/limb/foot/l_foot,
"r_foot" = /obj/limb/foot/r_foot,
-)
+))
/proc/check_zone(zone)
if(!zone)
@@ -99,17 +99,17 @@ var/global/list/limb_types_by_name = list(
var/rand_zone = zone
while (rand_zone == zone)
rand_zone = pick (
- organ_rel_size["head"]; "head",
- organ_rel_size["chest"]; "chest",
- organ_rel_size["groin"]; "groin",
- organ_rel_size["l_arm"]; "l_arm",
- organ_rel_size["r_arm"]; "r_arm",
- organ_rel_size["l_leg"]; "l_leg",
- organ_rel_size["r_leg"]; "r_leg",
- organ_rel_size["l_hand"]; "l_hand",
- organ_rel_size["r_hand"]; "r_hand",
- organ_rel_size["l_foot"]; "l_foot",
- organ_rel_size["r_foot"]; "r_foot",
+ GLOB.organ_rel_size["head"]; "head",
+ GLOB.organ_rel_size["chest"]; "chest",
+ GLOB.organ_rel_size["groin"]; "groin",
+ GLOB.organ_rel_size["l_arm"]; "l_arm",
+ GLOB.organ_rel_size["r_arm"]; "r_arm",
+ GLOB.organ_rel_size["l_leg"]; "l_leg",
+ GLOB.organ_rel_size["r_leg"]; "r_leg",
+ GLOB.organ_rel_size["l_hand"]; "l_hand",
+ GLOB.organ_rel_size["r_hand"]; "r_hand",
+ GLOB.organ_rel_size["l_foot"]; "l_foot",
+ GLOB.organ_rel_size["r_foot"]; "r_foot",
)
return rand_zone
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 64253fbac5df..86ce622824db 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -195,7 +195,7 @@
return
mob.crawling = FALSE
if(mob.confused)
- mob.Move(get_step(mob, pick(cardinal)))
+ mob.Move(get_step(mob, pick(GLOB.cardinals)))
else
. = ..()
diff --git a/code/modules/mob/mob_verbs.dm b/code/modules/mob/mob_verbs.dm
index 19296ba90b20..569e3a4d274d 100644
--- a/code/modules/mob/mob_verbs.dm
+++ b/code/modules/mob/mob_verbs.dm
@@ -155,7 +155,7 @@
return
M.key = key
- if(M.client) M.client.change_view(world_view_size)
+ if(M.client) M.client.change_view(GLOB.world_view_size)
// M.Login() //wat
return
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 9ff317260ccf..4b25d7a2ae39 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -25,14 +25,14 @@
client.playtitlemusic()
// To show them the full lobby art. This fixes itself on a mind transfer so no worries there.
- client.change_view(lobby_view_size)
+ client.change_view(GLOB.lobby_view_size)
// Credit the lobby art author
- if(displayed_lobby_art != -1)
+ if(GLOB.displayed_lobby_art != -1)
var/list/lobby_authors = CONFIG_GET(str_list/lobby_art_authors)
- var/author = lobby_authors[displayed_lobby_art]
+ var/author = lobby_authors[GLOB.displayed_lobby_art]
if(author != "Unknown")
to_chat(src, SPAN_ROUNDBODY("
This round's lobby art is brought to you by [author]
"))
- if(join_motd)
- to_chat(src, "[join_motd]
")
- if(current_tms)
- to_chat(src, SPAN_BOLDANNOUNCE(current_tms))
+ if(GLOB.join_motd)
+ to_chat(src, "[GLOB.join_motd]
")
+ if(GLOB.current_tms)
+ to_chat(src, SPAN_BOLDANNOUNCE(GLOB.current_tms))
diff --git a/code/modules/mob/new_player/logout.dm b/code/modules/mob/new_player/logout.dm
index 11589f59ee34..4f9a45f5667e 100644
--- a/code/modules/mob/new_player/logout.dm
+++ b/code/modules/mob/new_player/logout.dm
@@ -1,6 +1,6 @@
/mob/new_player/Logout()
if(ready)
- readied_players--
+ GLOB.readied_players--
ready = FALSE
. = ..()
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a6b654ba2da1..c53fe47257d2 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -18,7 +18,7 @@
/mob/new_player/Destroy()
if(ready)
- readied_players--
+ GLOB.readied_players--
GLOB.new_player_list -= src
return ..()
@@ -97,14 +97,14 @@
if("ready")
if( (SSticker.current_state <= GAME_STATE_PREGAME) && !ready) // Make sure we don't ready up after the round has started
ready = TRUE
- readied_players++
+ GLOB.readied_players++
new_player_panel_proc()
if("unready")
if((SSticker.current_state <= GAME_STATE_PREGAME) && ready) // Make sure we don't ready up after the round has started
ready = FALSE
- readied_players--
+ GLOB.readied_players--
new_player_panel_proc()
@@ -145,7 +145,7 @@
mind.transfer_to(observer, TRUE)
if(observer.client)
- observer.client.change_view(world_view_size)
+ observer.client.change_view(GLOB.world_view_size)
observer.set_huds_from_prefs()
@@ -207,7 +207,7 @@
if("SelectedJob")
- if(!enter_allowed)
+ if(!GLOB.enter_allowed)
to_chat(usr, SPAN_WARNING("There is an administrative lock on entering the game! (The dropship likely crashed into the Almayer. This should take at most 20 minutes.)"))
return
@@ -228,16 +228,16 @@
new_player_panel()
/mob/new_player/proc/AttemptLateSpawn(rank)
- var/datum/job/player_rank = RoleAuthority.roles_for_mode[rank]
+ var/datum/job/player_rank = GLOB.RoleAuthority.roles_for_mode[rank]
if (src != usr)
return
if(SSticker.current_state != GAME_STATE_PLAYING)
to_chat(usr, SPAN_WARNING("The round is either not ready, or has already finished!"))
return
- if(!enter_allowed)
+ if(!GLOB.enter_allowed)
to_chat(usr, SPAN_WARNING("There is an administrative lock on entering the game! (The dropship likely crashed into the Almayer. This should take at most 20 minutes.)"))
return
- if(!RoleAuthority.assign_role(src, player_rank, 1))
+ if(!GLOB.RoleAuthority.assign_role(src, player_rank, 1))
to_chat(src, alert("[rank] is not available. Please try another."))
return
@@ -245,18 +245,18 @@
close_spawn_windows()
var/mob/living/carbon/human/character = create_character(TRUE) //creates the human and transfers vars and mind
- RoleAuthority.equip_role(character, player_rank, late_join = TRUE)
+ GLOB.RoleAuthority.equip_role(character, player_rank, late_join = TRUE)
EquipCustomItems(character)
- if((security_level > SEC_LEVEL_BLUE || SShijack.hijack_status) && player_rank.gets_emergency_kit)
+ if((GLOB.security_level > SEC_LEVEL_BLUE || SShijack.hijack_status) && player_rank.gets_emergency_kit)
to_chat(character, SPAN_HIGHDANGER("As you stagger out of hypersleep, the sleep bay blares: '[SShijack.evac_status ? "VESSEL UNDERGOING EVACUATION PROCEDURES, SELF DEFENSE KIT PROVIDED" : "VESSEL IN HEIGHTENED ALERT STATUS, SELF DEFENSE KIT PROVIDED"]'."))
character.put_in_hands(new /obj/item/storage/box/kit/cryo_self_defense(character.loc))
GLOB.data_core.manifest_inject(character)
SSticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc. //TODO!!!!! ~Carn
- SSticker.mode.latejoin_tally += RoleAuthority.calculate_role_weight(player_rank)
+ SSticker.mode.latejoin_tally += GLOB.RoleAuthority.calculate_role_weight(player_rank)
- for(var/datum/squad/sq in RoleAuthority.squads)
+ for(var/datum/squad/sq in GLOB.RoleAuthority.squads)
if(sq)
sq.max_engineers = engi_slot_formula(GLOB.clients.len)
sq.max_medics = medic_slot_formula(GLOB.clients.len)
@@ -303,44 +303,44 @@
dat += "Choose from the following open positions:
"
var/roles_show = FLAG_SHOW_ALL_JOBS
- for(var/i in RoleAuthority.roles_for_mode)
- var/datum/job/J = RoleAuthority.roles_for_mode[i]
- if(!RoleAuthority.check_role_entry(src, J, TRUE))
+ for(var/i in GLOB.RoleAuthority.roles_for_mode)
+ var/datum/job/J = GLOB.RoleAuthority.roles_for_mode[i]
+ if(!GLOB.RoleAuthority.check_role_entry(src, J, TRUE))
continue
var/active = 0
// Only players with the job assigned and AFK for less than 10 minutes count as active
for(var/mob/M in GLOB.player_list)
if(M.client && M.job == J.title)
active++
- if(roles_show & FLAG_SHOW_CIC && ROLES_CIC.Find(J.title))
+ if(roles_show & FLAG_SHOW_CIC && GLOB.ROLES_CIC.Find(J.title))
dat += "Command:
"
roles_show ^= FLAG_SHOW_CIC
- else if(roles_show & FLAG_SHOW_AUXIL_SUPPORT && ROLES_AUXIL_SUPPORT.Find(J.title))
+ else if(roles_show & FLAG_SHOW_AUXIL_SUPPORT && GLOB.ROLES_AUXIL_SUPPORT.Find(J.title))
dat += "
Auxiliary Combat Support:
"
roles_show ^= FLAG_SHOW_AUXIL_SUPPORT
- else if(roles_show & FLAG_SHOW_MISC && ROLES_MISC.Find(J.title))
+ else if(roles_show & FLAG_SHOW_MISC && GLOB.ROLES_MISC.Find(J.title))
dat += "
Other:
"
roles_show ^= FLAG_SHOW_MISC
- else if(roles_show & FLAG_SHOW_POLICE && ROLES_POLICE.Find(J.title))
+ else if(roles_show & FLAG_SHOW_POLICE && GLOB.ROLES_POLICE.Find(J.title))
dat += "
Military Police:
"
roles_show ^= FLAG_SHOW_POLICE
- else if(roles_show & FLAG_SHOW_ENGINEERING && ROLES_ENGINEERING.Find(J.title))
+ else if(roles_show & FLAG_SHOW_ENGINEERING && GLOB.ROLES_ENGINEERING.Find(J.title))
dat += "
Engineering:
"
roles_show ^= FLAG_SHOW_ENGINEERING
- else if(roles_show & FLAG_SHOW_REQUISITION && ROLES_REQUISITION.Find(J.title))
+ else if(roles_show & FLAG_SHOW_REQUISITION && GLOB.ROLES_REQUISITION.Find(J.title))
dat += "
Requisitions:
"
roles_show ^= FLAG_SHOW_REQUISITION
- else if(roles_show & FLAG_SHOW_MEDICAL && ROLES_MEDICAL.Find(J.title))
+ else if(roles_show & FLAG_SHOW_MEDICAL && GLOB.ROLES_MEDICAL.Find(J.title))
dat += "
Medbay:
"
roles_show ^= FLAG_SHOW_MEDICAL
- else if(roles_show & FLAG_SHOW_MARINES && ROLES_MARINES.Find(J.title))
+ else if(roles_show & FLAG_SHOW_MARINES && GLOB.ROLES_MARINES.Find(J.title))
dat += "
Squad Riflemen:
"
roles_show ^= FLAG_SHOW_MARINES
@@ -393,7 +393,7 @@
INVOKE_ASYNC(new_character, TYPE_PROC_REF(/mob/living/carbon/human, update_hair))
new_character.key = key //Manually transfer the key to log them in
- new_character.client?.change_view(world_view_size)
+ new_character.client?.change_view(GLOB.world_view_size)
return new_character
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index fb4dbac3c160..0f270a568304 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -237,9 +237,9 @@
if(JOB_SQUAD_TEAM_LEADER)
return /datum/equipment_preset/uscm/tl_equipped
if(JOB_CO)
- if(length(RoleAuthority.roles_whitelist))
- var/datum/job/J = RoleAuthority.roles_by_name[JOB_CO]
- return J.gear_preset_whitelist["[JOB_CO][J.get_whitelist_status(RoleAuthority.roles_whitelist, owner)]"]
+ if(length(GLOB.RoleAuthority.roles_whitelist))
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_CO]
+ return J.gear_preset_whitelist["[JOB_CO][J.get_whitelist_status(GLOB.RoleAuthority.roles_whitelist, owner)]"]
return /datum/equipment_preset/uscm_ship/commander
if(JOB_SO)
return /datum/equipment_preset/uscm_ship/so
@@ -258,9 +258,9 @@
if(JOB_COMBAT_REPORTER)
return /datum/equipment_preset/uscm_ship/reporter
if(JOB_SYNTH)
- if(length(RoleAuthority.roles_whitelist))
- var/datum/job/J = RoleAuthority.roles_by_name[JOB_SYNTH]
- return J.gear_preset_whitelist["[JOB_SYNTH][J.get_whitelist_status(RoleAuthority.roles_whitelist, owner)]"]
+ if(length(GLOB.RoleAuthority.roles_whitelist))
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_SYNTH]
+ return J.gear_preset_whitelist["[JOB_SYNTH][J.get_whitelist_status(GLOB.RoleAuthority.roles_whitelist, owner)]"]
return /datum/equipment_preset/synth/uscm
if(JOB_WORKING_JOE)
return /datum/equipment_preset/synth/working_joe
@@ -307,9 +307,9 @@
return pick(SSmapping.configs[GROUND_MAP].CO_survivor_types)
return /datum/equipment_preset/uscm_ship/commander
if(JOB_PREDATOR)
- if(length(RoleAuthority.roles_whitelist))
- var/datum/job/J = RoleAuthority.roles_by_name[JOB_PREDATOR]
- return J.gear_preset_whitelist["[JOB_PREDATOR][J.get_whitelist_status(RoleAuthority.roles_whitelist, owner)]"]
+ if(length(GLOB.RoleAuthority.roles_whitelist))
+ var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_PREDATOR]
+ return J.gear_preset_whitelist["[JOB_PREDATOR][J.get_whitelist_status(GLOB.RoleAuthority.roles_whitelist, owner)]"]
return /datum/equipment_preset/yautja/blooded
return /datum/equipment_preset/uscm/private_equipped
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 8cd5b148a161..032888f26709 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -66,7 +66,7 @@
return
if(!src.client.admin_holder || !(client.admin_holder.rights & R_MOD))
- if(!dsay_allowed)
+ if(!GLOB.dsay_allowed)
to_chat(src, SPAN_DANGER("Deadchat is globally muted"))
return
@@ -174,7 +174,7 @@ for it but just ignore it.
if(length(message) >= 2)
var/channel_prefix = copytext(message, 1 ,3)
- return department_radio_keys[channel_prefix]
+ return GLOB.department_radio_keys[channel_prefix]
return null
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index dcb478d0fc7c..aa292c39245b 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -108,7 +108,7 @@
O.mind.original = O
else
O.key = key
- if(O.client) O.client.change_view(world_view_size)
+ if(O.client) O.client.change_view(GLOB.world_view_size)
O.forceMove(loc)
O.job = "Cyborg"
@@ -180,7 +180,7 @@
new_xeno.a_intent = INTENT_HARM
new_xeno.key = key
- if(new_xeno.client) new_xeno.client.change_view(world_view_size)
+ if(new_xeno.client) new_xeno.client.change_view(GLOB.world_view_size)
to_chat(new_xeno, "You are now an alien.")
qdel(src)
@@ -202,7 +202,7 @@
var/mob/living/simple_animal/corgi/new_corgi = new /mob/living/simple_animal/corgi (loc)
new_corgi.a_intent = INTENT_HARM
new_corgi.key = key
- if(new_corgi.client) new_corgi.client.change_view(world_view_size)
+ if(new_corgi.client) new_corgi.client.change_view(GLOB.world_view_size)
to_chat(new_corgi, "You are now a Corgi. Yap Yap!")
qdel(src)
@@ -234,7 +234,7 @@
var/mob/new_mob = new mobpath(src.loc)
new_mob.key = key
- if(new_mob.client) new_mob.client.change_view(world_view_size)
+ if(new_mob.client) new_mob.client.change_view(GLOB.world_view_size)
new_mob.a_intent = INTENT_HARM
@@ -254,7 +254,7 @@
var/mob/new_mob = new mobpath(src.loc)
new_mob.key = key
- if(new_mob.client) new_mob.client.change_view(world_view_size)
+ if(new_mob.client) new_mob.client.change_view(GLOB.world_view_size)
new_mob.a_intent = INTENT_HARM
to_chat(new_mob, "You feel more... animalistic")
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index ce01931f5daf..7d24db7d529f 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -105,7 +105,7 @@ nanoui is used to open and update nano browser uis
*/
/datum/nanoui/Destroy()
if(user)
- nanomanager.ui_closed(src)
+ SSnano.nanomanager.ui_closed(src)
close_browser(user, "[window_id]")
user = null
@@ -440,7 +440,7 @@ nanoui is used to open and update nano browser uis
winset(user, "mapwindow.map", "focus=true") // return keyboard focus to map
on_close_winset()
//onclose(user, window_id)
- nanomanager.ui_opened(src)
+ SSnano.nanomanager.ui_opened(src)
/**
* Close this UI
@@ -449,7 +449,7 @@ nanoui is used to open and update nano browser uis
*/
/datum/nanoui/proc/close()
is_auto_updating = 0
- nanomanager.ui_closed(src)
+ SSnano.nanomanager.ui_closed(src)
close_browser(user, "[window_id]")
qdel(src)
@@ -516,7 +516,7 @@ nanoui is used to open and update nano browser uis
map_update = 1
if ((src_object && src_object.Topic(href, href_list)) || map_update)
- nanomanager.update_uis(src_object) // update all UIs attached to src_object
+ SSnano.nanomanager.update_uis(src_object) // update all UIs attached to src_object
/**
* Process this UI, updating the entire UI or just the status (aka visibility)
diff --git a/code/modules/objectives/data_retrieval.dm b/code/modules/objectives/data_retrieval.dm
index 01689a18d081..f66c578f48fb 100644
--- a/code/modules/objectives/data_retrieval.dm
+++ b/code/modules/objectives/data_retrieval.dm
@@ -14,7 +14,7 @@
/datum/cm_objective/retrieve_data/New()
. = ..()
- decryption_password = "[pick(alphabet_uppercase)][rand(100,999)][pick(alphabet_uppercase)][rand(10,99)]"
+ decryption_password = "[pick(GLOB.alphabet_uppercase)][rand(100,999)][pick(GLOB.alphabet_uppercase)][rand(10,99)]"
/datum/cm_objective/retrieve_data/pre_round_start()
SSobjectives.statistics["data_retrieval_total_instances"]++
@@ -208,7 +208,7 @@
disk_color = "Bloodied blue"
display_color = "#5296e3"
- label = "[pick(greek_letters)]-[rand(100,999)]"
+ label = "[pick(GLOB.greek_letters)]-[rand(100,999)]"
name = "[disk_color] computer disk [label]"
objective = new /datum/cm_objective/retrieve_data/disk(src)
retrieve_objective = new /datum/cm_objective/retrieve_item/document(src)
@@ -237,7 +237,7 @@
/obj/structure/machinery/computer/objective/Initialize()
. = ..()
- label = "[pick(greek_letters)]-[rand(100,999)]"
+ label = "[pick(GLOB.greek_letters)]-[rand(100,999)]"
name = "data terminal [label]"
objective = new /datum/cm_objective/retrieve_data/terminal(src)
diff --git a/code/modules/objectives/documents.dm b/code/modules/objectives/documents.dm
index 5c6041a406c2..8562f1985e7f 100644
--- a/code/modules/objectives/documents.dm
+++ b/code/modules/objectives/documents.dm
@@ -129,7 +129,7 @@
/obj/item/document_objective/Initialize(mapload, ...)
. = ..()
- label = "[pick(alphabet_uppercase)][rand(100,999)]"
+ label = "[pick(GLOB.alphabet_uppercase)][rand(100,999)]"
objective = new objective_type(src)
retrieve_objective = new /datum/cm_objective/retrieve_item/document(src)
LAZYADD(objective.enables_objectives, retrieve_objective)
diff --git a/code/modules/objectives/objective_memory_storage.dm b/code/modules/objectives/objective_memory_storage.dm
index 08dfc8cdb2c2..161c78d4d1ba 100644
--- a/code/modules/objectives/objective_memory_storage.dm
+++ b/code/modules/objectives/objective_memory_storage.dm
@@ -77,26 +77,26 @@
/datum/objective_memory_storage/proc/synchronize_objectives()
clean_objectives()
- if(!intel_system || !intel_system.oms)
+ if(!GLOB.intel_system || !GLOB.intel_system.oms)
return
- intel_system.oms.clean_objectives()
+ GLOB.intel_system.oms.clean_objectives()
- for(var/datum/cm_objective/O in intel_system.oms.folders)
+ for(var/datum/cm_objective/O in GLOB.intel_system.oms.folders)
addToListNoDupe(folders, O)
- for(var/datum/cm_objective/O in intel_system.oms.progress_reports)
+ for(var/datum/cm_objective/O in GLOB.intel_system.oms.progress_reports)
addToListNoDupe(progress_reports, O)
- for(var/datum/cm_objective/O in intel_system.oms.technical_manuals)
+ for(var/datum/cm_objective/O in GLOB.intel_system.oms.technical_manuals)
addToListNoDupe(technical_manuals, O)
- for(var/datum/cm_objective/O in intel_system.oms.terminals)
+ for(var/datum/cm_objective/O in GLOB.intel_system.oms.terminals)
addToListNoDupe(terminals, O)
- for(var/datum/cm_objective/O in intel_system.oms.disks)
+ for(var/datum/cm_objective/O in GLOB.intel_system.oms.disks)
addToListNoDupe(disks, O)
- for(var/datum/cm_objective/O in intel_system.oms.retrieve_items)
+ for(var/datum/cm_objective/O in GLOB.intel_system.oms.retrieve_items)
addToListNoDupe(retrieve_items, O)
- for(var/datum/cm_objective/O in intel_system.oms.other)
+ for(var/datum/cm_objective/O in GLOB.intel_system.oms.other)
addToListNoDupe(other, O)
-var/global/datum/intel_system/intel_system = new()
+GLOBAL_DATUM_INIT(intel_system, /datum/intel_system, new())
/datum/intel_system
var/datum/objective_memory_storage/oms = new()
@@ -127,7 +127,7 @@ var/global/datum/intel_system/intel_system = new()
if(!powered())
to_chat(user, SPAN_WARNING("This computer has no power!"))
return FALSE
- if(!intel_system)
+ if(!GLOB.intel_system)
to_chat(user, SPAN_WARNING("The computer doesn't seem to be connected to anything..."))
return FALSE
if(user.action_busy)
@@ -197,9 +197,9 @@ var/global/datum/intel_system/intel_system = new()
return TRUE
/obj/structure/machinery/computer/intel/proc/transfer_intel(mob/living/user, datum/cm_objective/O)
- if(!intel_system || !intel_system.oms)
+ if(!GLOB.intel_system || !GLOB.intel_system.oms)
return 0
- if(intel_system.oms.has_objective(O))
+ if(GLOB.intel_system.oms.has_objective(O))
return 0
if(user.action_busy)
return 0
@@ -215,7 +215,7 @@ var/global/datum/intel_system/intel_system = new()
return -1
to_chat(user, SPAN_NOTICE("...something about \"[clue]\"..."))
- intel_system.store_single_objective(O)
+ GLOB.intel_system.store_single_objective(O)
return 1
// --------------------------------------------
@@ -236,7 +236,7 @@ var/global/datum/intel_system/intel_system = new()
if(!powered())
to_chat(user, SPAN_WARNING("This computer has no power!"))
return FALSE
- if(!intel_system)
+ if(!GLOB.intel_system)
to_chat(user, SPAN_WARNING("The computer doesn't seem to be connected to anything..."))
return FALSE
if(user.action_busy)
diff --git a/code/modules/objectives/power_objectives.dm b/code/modules/objectives/power_objectives.dm
index ecd192caa32e..8f18af9337ea 100644
--- a/code/modules/objectives/power_objectives.dm
+++ b/code/modules/objectives/power_objectives.dm
@@ -16,7 +16,7 @@
/datum/cm_objective/power/pre_round_start()
if(uses_smes)
- for(var/obj/structure/machinery/power/smes/colony_smes in machines)
+ for(var/obj/structure/machinery/power/smes/colony_smes in GLOB.machines)
if(!is_ground_level(colony_smes.loc.z))
continue
LAZYADD(power_objects, colony_smes)
diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm
index fd81c25bec9f..8df96650ac50 100644
--- a/code/modules/organs/limbs.dm
+++ b/code/modules/organs/limbs.dm
@@ -945,7 +945,7 @@ This function completely restores a damaged organ to perfect condition.
if(organ)
//Throw organs around
- var/lol = pick(cardinal)
+ var/lol = pick(GLOB.cardinals)
step(organ,lol)
owner.update_body() //Among other things, this calls update_icon() and updates our visuals.
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index e18c1ce3c2e7..80d0463b0e64 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -227,10 +227,10 @@
t = replacetext(t, "\[large\]", "")
t = replacetext(t, "\[/large\]", "")
t = replacetext(t, "\[sign\]", "[user ? user.real_name : "Anonymous"]")
- t = replacetext(t, "\[date\]", "[time2text(REALTIMEOFDAY, "Day DD Month [game_year]")]")
- t = replacetext(t, "\[shortdate\]", "[time2text(REALTIMEOFDAY, "DD/MM/[game_year]")]")
+ t = replacetext(t, "\[date\]", "[time2text(REALTIMEOFDAY, "Day DD Month [GLOB.game_year]")]")
+ t = replacetext(t, "\[shortdate\]", "[time2text(REALTIMEOFDAY, "DD/MM/[GLOB.game_year]")]")
t = replacetext(t, "\[time\]", "[worldtime2text("hh:mm")]")
- t = replacetext(t, "\[date+time\]", "[worldtime2text("hh:mm")], [time2text(REALTIMEOFDAY, "Day DD Month [game_year]")]")
+ t = replacetext(t, "\[date+time\]", "[worldtime2text("hh:mm")], [time2text(REALTIMEOFDAY, "Day DD Month [GLOB.game_year]")]")
t = replacetext(t, "\[field\]", "")
t = replacetext(t, "\[h1\]", "")
@@ -666,34 +666,34 @@
if(!C)
var/random_chem
if(tier)
- random_chem = pick(chemical_gen_classes_list[tier])
+ random_chem = pick(GLOB.chemical_gen_classes_list[tier])
else
if(note_type == "test")
- random_chem = pick(chemical_gen_classes_list["T4"])
+ random_chem = pick(GLOB.chemical_gen_classes_list["T4"])
else
- random_chem = pick( prob(55);pick(chemical_gen_classes_list["T2"]),
- prob(30);pick(chemical_gen_classes_list["T3"]),
- prob(15);pick(chemical_gen_classes_list["T4"]))
+ random_chem = pick( prob(55);pick(GLOB.chemical_gen_classes_list["T2"]),
+ prob(30);pick(GLOB.chemical_gen_classes_list["T3"]),
+ prob(15);pick(GLOB.chemical_gen_classes_list["T4"]))
if(!random_chem)
- random_chem = pick(chemical_gen_classes_list["T1"])
- C = chemical_reagents_list["[random_chem]"]
+ random_chem = pick(GLOB.chemical_gen_classes_list["T1"])
+ C = GLOB.chemical_reagents_list["[random_chem]"]
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
var/txt = "["wylogo.png"]])
Official Weyland-Yutani Document
Experiment Notes
"
switch(note_type)
if("synthesis")
- var/datum/chemical_reaction/G = chemical_reactions_list[C.id]
+ var/datum/chemical_reaction/G = GLOB.chemical_reactions_list[C.id]
name = "Synthesis of [C.name]"
icon_state = "paper_wy_partial_report"
txt += "[name]
"
txt += "During experiment [pick("C","Q","V","W","X","Y","Z")][rand(100,999)][pick("a","b","c")] the theorized compound identified as [C.name], was successfully synthesized using the following formula:
\n
\n"
for(var/I in G.required_reagents)
- var/datum/reagent/R = chemical_reagents_list["[I]"]
+ var/datum/reagent/R = GLOB.chemical_reagents_list["[I]"]
var/U = G.required_reagents[I]
txt += " - [U] [R.name]
\n"
if(G.required_catalysts && G.required_catalysts.len)
txt += "
\nWhile using the following catalysts:
\n
\n"
for(var/I in G.required_catalysts)
- var/datum/reagent/R = chemical_reagents_list["[I]"]
+ var/datum/reagent/R = GLOB.chemical_reagents_list["[I]"]
var/U = G.required_catalysts[I]
txt += " - [U] [R.name]
\n"
if(full_report)
@@ -770,16 +770,16 @@
/obj/item/paper/research_notes/unique/Initialize()
//Each one of these get a new unique chem
var/datum/reagent/generated/C = new /datum/reagent/generated
- C.id = "tau-[length(chemical_gen_classes_list["tau"])]"
+ C.id = "tau-[length(GLOB.chemical_gen_classes_list["tau"])]"
C.generate_name()
C.chemclass = CHEM_CLASS_RARE
if(gen_tier)
C.gen_tier = gen_tier
else
- C.gen_tier = chemical_data.clearance_level
+ C.gen_tier = GLOB.chemical_data.clearance_level
C.generate_stats()
- chemical_gen_classes_list["tau"] += C.id //Because each unique_vended should be unique, we do not save the chemclass anywhere but in the tau list
- chemical_reagents_list[C.id] = C
+ GLOB.chemical_gen_classes_list["tau"] += C.id //Because each unique_vended should be unique, we do not save the chemclass anywhere but in the tau list
+ GLOB.chemical_reagents_list[C.id] = C
C.generate_assoc_recipe()
data = C
msg_admin_niche("New reagent with id [C.id], name [C.name], level [C.gen_tier], generated and printed at [loc] [ADMIN_JMP(loc)].")
@@ -803,7 +803,7 @@
info += "ID: [S.name]
\n"
info += "Database Details:
\n"
if(S.chemclass >= CHEM_CLASS_ULTRA)
- if(chemical_data.clearance_level >= S.gen_tier || info_only)
+ if(GLOB.chemical_data.clearance_level >= S.gen_tier || info_only)
info += "The following information relating to [S.name] is restricted with a level [S.gen_tier] clearance classification.
"
info += "[S.description]\n"
info += "
Overdoses at: [S.overdose] units\n"
@@ -813,7 +813,7 @@
else
info += "CLASSIFIED: Clearance level [S.gen_tier] required to read the database entry.
\n"
icon_state = "paper_wy_partial_report"
- else if(S.chemclass == CHEM_CLASS_SPECIAL && !chemical_data.clearance_x_access && !info_only)
+ else if(S.chemclass == CHEM_CLASS_SPECIAL && !GLOB.chemical_data.clearance_x_access && !info_only)
info += "CLASSIFIED: Clearance level X required to read the database entry.
\n"
icon_state = "paper_wy_partial_report"
else if(S.description)
@@ -825,14 +825,14 @@
else
info += "No details on this reagent could be found in the database.
\n"
icon_state = "paper_wy_synthesis"
- if(S.chemclass >= CHEM_CLASS_SPECIAL && !chemical_data.chemical_identified_list[S.id] && !info_only)
+ if(S.chemclass >= CHEM_CLASS_SPECIAL && !GLOB.chemical_data.chemical_identified_list[S.id] && !info_only)
info += "
Saved emission spectrum of [S.name] to the database.
\n"
info += "
Composition Details:
\n"
- if(chemical_reactions_list[S.id])
- var/datum/chemical_reaction/C = chemical_reactions_list[S.id]
+ if(GLOB.chemical_reactions_list[S.id])
+ var/datum/chemical_reaction/C = GLOB.chemical_reactions_list[S.id]
for(var/I in C.required_reagents)
- var/datum/reagent/R = chemical_reagents_list["[I]"]
- if(R.chemclass >= CHEM_CLASS_SPECIAL && !chemical_data.chemical_identified_list[R.id] && !info_only)
+ var/datum/reagent/R = GLOB.chemical_reagents_list["[I]"]
+ if(R.chemclass >= CHEM_CLASS_SPECIAL && !GLOB.chemical_data.chemical_identified_list[R.id] && !info_only)
info += " - Unknown emission spectrum
\n"
completed = FALSE
else
@@ -842,14 +842,14 @@
if(C.required_catalysts.len)
info += "
Reaction would require the following catalysts:
\n"
for(var/I in C.required_catalysts)
- var/datum/reagent/R = chemical_reagents_list["[I]"]
- if(R.chemclass >= CHEM_CLASS_SPECIAL && !chemical_data.chemical_identified_list[R.id] && !info_only)
+ var/datum/reagent/R = GLOB.chemical_reagents_list["[I]"]
+ if(R.chemclass >= CHEM_CLASS_SPECIAL && !GLOB.chemical_data.chemical_identified_list[R.id] && !info_only)
info += " - Unknown emission spectrum
\n"
completed = FALSE
else
var/U = C.required_catalysts[I]
info += " - [U] [R.name]
\n"
- else if(chemical_gen_classes_list["C1"].Find(S.id))
+ else if(GLOB.chemical_gen_classes_list["C1"].Find(S.id))
info += " - [S.name]
\n"
else
info += "ERROR: Unable to analyze emission spectrum of sample." //A reaction to make this doesn't exist, so this is our IC excuse
@@ -860,7 +860,7 @@
else
if(!S.properties) //Safety for empty reagents
completed = FALSE
- if(S.chemclass == CHEM_CLASS_SPECIAL && chemical_data.clearance_x_access)
+ if(S.chemclass == CHEM_CLASS_SPECIAL && GLOB.chemical_data.clearance_x_access)
completed = TRUE
data = S
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index dbd490792e8f..f5a680c5076a 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -288,7 +288,7 @@
/obj/item/device/camera/proc/captureimage(atom/target, mob/user, flag)
var/mob_descriptions = ""
var/radius = (size-1)*0.5
- var/list/turf/turfs = RANGE_TURFS(radius, target) & view(world_view_size + radius, user.client)
+ var/list/turf/turfs = RANGE_TURFS(radius, target) & view(GLOB.world_view_size + radius, user.client)
for(var/turf/the_turf as anything in turfs)
mob_descriptions = get_mob_descriptions(the_turf, mob_descriptions)
var/datum/picture/the_picture = createpicture(target, user, turfs, mob_descriptions, flag)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 731ad78caa5b..df4e9badc598 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1011,7 +1011,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list(
return 0
if(!(ishuman(user) || isRemoteControlling(user)))
to_chat(user, SPAN_WARNING("You don't have the dexterity to use [src]!"))
- nanomanager.close_user_uis(user, src)
+ SSnano.nanomanager.close_user_uis(user, src)
return 0
if(user.is_mob_restrained())
to_chat(user, SPAN_WARNING("You must have free hands to use [src]."))
@@ -1024,11 +1024,11 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list(
if(aidisabled)
if(!loud)
to_chat(user, SPAN_WARNING("[src] has AI control disabled!"))
- nanomanager.close_user_uis(user, src)
+ SSnano.nanomanager.close_user_uis(user, src)
return 0
else
if((!in_range(src, user) || !istype(src.loc, /turf)))
- nanomanager.close_user_uis(user, src)
+ SSnano.nanomanager.close_user_uis(user, src)
return 0
var/mob/living/carbon/human/H = user
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index bee3e0aac8c2..00e6b92eab8f 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -81,13 +81,13 @@
if(has_power || !src.needs_power)
if(machine_processing)
if(stat & NOPOWER)
- addToListNoDupe(processing_machines, src) // power interupted us, start processing again
+ addToListNoDupe(GLOB.processing_machines, src) // power interupted us, start processing again
stat &= ~NOPOWER
src.update_use_power(USE_POWER_IDLE)
else
if(machine_processing)
- processing_machines -= src // no power, can't process.
+ GLOB.processing_machines -= src // no power, can't process.
stat |= NOPOWER
src.update_use_power(USE_POWER_NONE)
@@ -97,19 +97,19 @@
// rebuild all power networks from scratch
/proc/makepowernets()
- for(var/datum/powernet/PN in powernets)
+ for(var/datum/powernet/PN in GLOB.powernets)
del(PN) //not qdel on purpose, powernet is still using del.
- powernets.Cut()
+ GLOB.powernets.Cut()
- for(var/area/A in all_areas)
- if(powernets_by_name[A.powernet_name])
+ for(var/area/A in GLOB.all_areas)
+ if(GLOB.powernets_by_name[A.powernet_name])
continue
var/datum/powernet/PN = new()
PN.powernet_name = A.powernet_name
- powernets += PN
- powernets_by_name[A.powernet_name] = PN
+ GLOB.powernets += PN
+ GLOB.powernets_by_name[A.powernet_name] = PN
- for(var/obj/structure/machinery/power/M in machines)
+ for(var/obj/structure/machinery/power/M in GLOB.machines)
M.connect_to_network()
return 1
@@ -222,7 +222,7 @@
var/cdir
- for(var/card in cardinal)
+ for(var/card in GLOB.cardinals)
var/turf/T = get_step(loc,card)
cdir = get_dir(T,loc)
@@ -250,7 +250,7 @@
var/area/A = get_area(src)
if(!A)
return 0
- var/datum/powernet/PN = powernets_by_name[A.powernet_name]
+ var/datum/powernet/PN = GLOB.powernets_by_name[A.powernet_name]
if(!PN)
return 0
powernet = PN
diff --git a/code/modules/power/profiling.dm b/code/modules/power/profiling.dm
index 21c8e2a63538..b4b67b8c8543 100644
--- a/code/modules/power/profiling.dm
+++ b/code/modules/power/profiling.dm
@@ -1,29 +1,27 @@
-datum
+GLOBAL_VAR_INIT(enable_power_update_profiling, FALSE)
-var/global/enable_power_update_profiling = 0
-
-var/global/power_profiled_time = 0
-var/global/power_last_profile_time = 0
-var/global/list/power_update_requests_by_machine = list()
-var/global/list/power_update_requests_by_area = list()
+GLOBAL_VAR_INIT(power_profiled_time, 0)
+GLOBAL_VAR_INIT(power_last_profile_time, 0)
+GLOBAL_LIST_EMPTY(power_update_requests_by_machine)
+GLOBAL_LIST_EMPTY(power_update_requests_by_area)
/proc/log_power_update_request(area/A, obj/structure/machinery/M)
- if (!enable_power_update_profiling)
+ if (!GLOB.enable_power_update_profiling)
return
var/machine_type = "[M.type]"
- if (machine_type in power_update_requests_by_machine)
- power_update_requests_by_machine[machine_type]++
+ if (machine_type in GLOB.power_update_requests_by_machine)
+ GLOB.power_update_requests_by_machine[machine_type]++
else
- power_update_requests_by_machine[machine_type] = 1
+ GLOB.power_update_requests_by_machine[machine_type] = 1
- if (A.name in power_update_requests_by_area)
- power_update_requests_by_area[A.name]++
+ if (A.name in GLOB.power_update_requests_by_area)
+ GLOB.power_update_requests_by_area[A.name]++
else
- power_update_requests_by_area[A.name] = 1
+ GLOB.power_update_requests_by_area[A.name] = 1
- power_profiled_time += (world.time - power_last_profile_time)
- power_last_profile_time = world.time
+ GLOB.power_profiled_time += (world.time - GLOB.power_last_profile_time)
+ GLOB.power_last_profile_time = world.time
/client/proc/toggle_power_update_profiling()
set name = "Toggle Area Power Update Profiling"
@@ -31,14 +29,14 @@ var/global/list/power_update_requests_by_area = list()
set category = "Debug.Profiling"
if(!check_rights(R_DEBUG)) return
if(!ishost(usr) || alert("Are you sure you want to do this?",, "Yes", "No") != "Yes") return
- if(enable_power_update_profiling)
- enable_power_update_profiling = 0
+ if(GLOB.enable_power_update_profiling)
+ GLOB.enable_power_update_profiling = 0
to_chat(usr, "Area power update profiling disabled.")
message_admins("[key_name(src)] toggled area power update profiling off.")
else
- enable_power_update_profiling = 1
- power_last_profile_time = world.time
+ GLOB.enable_power_update_profiling = 1
+ GLOB.power_last_profile_time = world.time
to_chat(usr, "Area power update profiling enabled.")
message_admins("[key_name(src)] toggled area power update profiling on.")
@@ -52,9 +50,9 @@ var/global/list/power_update_requests_by_area = list()
if(!check_rights(R_DEBUG)) return
- to_chat(usr, "Total profiling time: [power_profiled_time] ticks")
- for (var/M in power_update_requests_by_machine)
- to_chat(usr, "[M] = [power_update_requests_by_machine[M]]")
+ to_chat(usr, "Total profiling time: [GLOB.power_profiled_time] ticks")
+ for (var/M in GLOB.power_update_requests_by_machine)
+ to_chat(usr, "[M] = [GLOB.power_update_requests_by_machine[M]]")
/client/proc/view_power_update_stats_area()
set name = "View Area Power Update Statistics By Area"
@@ -63,7 +61,7 @@ var/global/list/power_update_requests_by_area = list()
if(!check_rights(R_DEBUG)) return
- to_chat(usr, "Total profiling time: [power_profiled_time] ticks")
- to_chat(usr, "Total profiling time: [power_profiled_time] ticks")
- for (var/A in power_update_requests_by_area)
- to_chat(usr, "[A] = [power_update_requests_by_area[A]]")
+ to_chat(usr, "Total profiling time: [GLOB.power_profiled_time] ticks")
+ to_chat(usr, "Total profiling time: [GLOB.power_profiled_time] ticks")
+ for (var/A in GLOB.power_update_requests_by_area)
+ to_chat(usr, "[A] = [GLOB.power_update_requests_by_area[A]]")
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 0e469a7fe577..7cf72ce1cb81 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -46,7 +46,7 @@
connect_to_network()
dir_loop:
- for(var/d in cardinal)
+ for(var/d in GLOB.cardinals)
var/turf/T = get_step(src, d)
for(var/obj/structure/machinery/power/terminal/term in T)
if(term && term.dir == turn(d, 180))
diff --git a/code/modules/projectiles/ammo_boxes/grenade_packets.dm b/code/modules/projectiles/ammo_boxes/grenade_packets.dm
index 83c222a0a128..5546fe3bc520 100644
--- a/code/modules/projectiles/ammo_boxes/grenade_packets.dm
+++ b/code/modules/projectiles/ammo_boxes/grenade_packets.dm
@@ -25,7 +25,7 @@
for(var/i in 1 to storage_slots)
new content_type(src)
-var/list/grenade_packets = list(
+GLOBAL_LIST_INIT(grenade_packets, list(
/obj/item/storage/box/packet/high_explosive,
/obj/item/storage/box/packet/baton_slug,
/obj/item/storage/box/packet/flare,
@@ -37,7 +37,7 @@ var/list/grenade_packets = list(
/obj/item/storage/box/packet/m15,
/obj/item/storage/box/packet/airburst_he,
/obj/item/storage/box/packet/airburst_incen
- )
+ ))
/obj/item/storage/box/packet/high_explosive
name = "\improper HEDP grenade packet"
diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
index 20781639a579..e5c2ecb2d640 100644
--- a/code/modules/projectiles/gun_attachables.dm
+++ b/code/modules/projectiles/gun_attachables.dm
@@ -1283,7 +1283,7 @@ Defined in conflicts.dm of the #defines folder.
switch(action)
if("adjust_dir")
var/direction = params["offset_dir"]
- if(!(direction in alldirs) || !scoping || !scope_user)
+ if(!(direction in GLOB.alldirs) || !scoping || !scope_user)
return
var/mob/scoper = scope_user.resolve()
@@ -1300,7 +1300,7 @@ Defined in conflicts.dm of the #defines folder.
if("adjust_position")
var/direction = params["position_dir"]
- if(!(direction in alldirs) || !scoping || !scope_user)
+ if(!(direction in GLOB.alldirs) || !scoping || !scope_user)
return
var/mob/scoper = scope_user.resolve()
@@ -1367,7 +1367,7 @@ Defined in conflicts.dm of the #defines folder.
return TRUE
/obj/item/attachable/vulture_scope/proc/get_offset_dirs()
- var/list/possible_dirs = alldirs.Copy()
+ var/list/possible_dirs = GLOB.alldirs.Copy()
if(scope_offset_x >= scope_drift_max)
possible_dirs -= list(NORTHEAST, EAST, SOUTHEAST)
else if(scope_offset_x <= -scope_drift_max)
@@ -1384,7 +1384,7 @@ Defined in conflicts.dm of the #defines folder.
/obj/item/attachable/vulture_scope/proc/get_adjust_dirs()
if(!scoping)
return list()
- var/list/possible_dirs = alldirs.Copy()
+ var/list/possible_dirs = GLOB.alldirs.Copy()
var/turf/current_turf = get_turf(src)
var/turf/scope_tile = locate(scope_x, scope_y, current_turf.z)
var/mob/scoper = scope_user.resolve()
diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
index 323e994529ae..fe832d88af5e 100644
--- a/code/modules/projectiles/guns/flamer/flamer.dm
+++ b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -728,7 +728,7 @@ GLOBAL_LIST_EMPTY(flamer_particles)
if(target.density)
return
- for(var/spread_direction in alldirs)
+ for(var/spread_direction in GLOB.alldirs)
var/spread_power = remaining_distance
@@ -774,7 +774,7 @@ GLOBAL_LIST_EMPTY(flamer_particles)
fire_reag.burncolor = f_color
new/obj/flamer_fire(target, cause_data, fire_reag)
- for(var/direction in alldirs)
+ for(var/direction in GLOB.alldirs)
var/spread_power = range
switch(direction)
if(NORTH,SOUTH,EAST,WEST)
diff --git a/code/modules/projectiles/guns/flamer/flameshape.dm b/code/modules/projectiles/guns/flamer/flameshape.dm
index f5a0699067e4..ae6c2dec0a67 100644
--- a/code/modules/projectiles/guns/flamer/flameshape.dm
+++ b/code/modules/projectiles/guns/flamer/flameshape.dm
@@ -28,7 +28,7 @@
/datum/flameshape/default/handle_fire_spread(obj/flamer_fire/F, fire_spread_amount, burn_dam, fuel_pressure = 1)
var/turf/T
var/turf/source_turf = get_turf(F.loc)
- for(var/dirn in cardinal)
+ for(var/dirn in GLOB.cardinals)
T = get_step(source_turf, dirn)
if(istype(T, /turf/open/space))
continue
@@ -64,7 +64,7 @@
id = FLAMESHAPE_STAR
/datum/flameshape/star/proc/dirs_to_use()
- return alldirs
+ return GLOB.alldirs
/datum/flameshape/star/handle_fire_spread(obj/flamer_fire/F, fire_spread_amount, burn_dam, fuel_pressure = 1)
fire_spread_amount = Floor(fire_spread_amount * 1.5) // branch 'length'
@@ -102,9 +102,9 @@
/datum/flameshape/star/minor/dirs_to_use()
if(prob(50))
- return cardinal
+ return GLOB.cardinals
else
- return diagonals
+ return GLOB.diagonals
/datum/flameshape/line
name = "Line"
diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm
index 24e482549dac..9f137b1c2316 100644
--- a/code/modules/projectiles/magazines/shotguns.dm
+++ b/code/modules/projectiles/magazines/shotguns.dm
@@ -8,11 +8,11 @@ you're looking back on the different shotgun projectiles available. In short of
one type of shotgun ammo, but I think it helps in referencing it. ~N
*/
-var/list/shotgun_boxes_12g = list(
+GLOBAL_LIST_INIT(shotgun_boxes_12g, list(
/obj/item/ammo_magazine/shotgun/buckshot,
/obj/item/ammo_magazine/shotgun/flechette,
/obj/item/ammo_magazine/shotgun/slugs
- )
+ ))
/obj/item/ammo_magazine/shotgun
name = "box of shotgun slugs"
@@ -151,21 +151,21 @@ also doesn't really matter. You can only reload them with handfuls.
Handfuls of shotgun rounds. For spawning directly on mobs in roundstart, ERTs, etc
*/
-var/list/shotgun_handfuls_8g = list(
+GLOBAL_LIST_INIT(shotgun_handfuls_8g, list(
/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
/obj/item/ammo_magazine/handful/shotgun/heavy/buckshot,
/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath
- )
+ ))
-var/list/shotgun_handfuls_12g = list(
+GLOBAL_LIST_INIT(shotgun_handfuls_12g, list(
/obj/item/ammo_magazine/handful/shotgun/slug,
/obj/item/ammo_magazine/handful/shotgun/buckshot,
/obj/item/ammo_magazine/handful/shotgun/flechette,
/obj/item/ammo_magazine/handful/shotgun/incendiary,
/obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary,
/obj/item/ammo_magazine/handful/shotgun/beanbag
- )
+ ))
/obj/item/ammo_magazine/handful/shotgun
name = "handful of shotgun slugs (12g)"
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index adb97e3a1c43..37e398080227 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -193,10 +193,10 @@
setDir(get_dir(loc, target_turf))
var/ammo_flags = ammo.flags_ammo_behavior | projectile_override_flags
- if(round_statistics && ammo_flags & AMMO_BALLISTIC)
- round_statistics.total_projectiles_fired++
+ if(GLOB.round_statistics && ammo_flags & AMMO_BALLISTIC)
+ GLOB.round_statistics.total_projectiles_fired++
if(ammo.bonus_projectiles_amount)
- round_statistics.total_projectiles_fired += ammo.bonus_projectiles_amount
+ GLOB.round_statistics.total_projectiles_fired += ammo.bonus_projectiles_amount
if(firer && ismob(firer) && weapon_cause_data)
var/mob/M = firer
M.track_shot(weapon_cause_data.cause_name)
@@ -466,7 +466,7 @@
def_zone = rand_zone()
// Other targets do the same roll with penalty - a near hit will hit but redirected to another limb
- else if(!isxeno(L) && hit_roll > hit_chance - 20 - base_miss_chance[def_zone])
+ else if(!isxeno(L) && hit_roll > hit_chance - 20 - GLOB.base_miss_chance[def_zone])
def_zone = rand_zone()
else
@@ -478,7 +478,7 @@
// simply to avoid them from resetting target to chest every time they want to shoot a xeno
if(!direct_hit || !isxeno(L)) // For normal people or direct hits we apply the limb accuracy penalty
- hit_chance -= base_miss_chance[def_zone]
+ hit_chance -= GLOB.base_miss_chance[def_zone]
// else for direct hits on xenos, we skip it, pretending it's a chest shot with zero penalty
#if DEBUG_HIT_CHANCE
@@ -1185,7 +1185,7 @@
var/area/A = get_area(src)
if(ishuman(firingMob) && ishuman(src) && faction == firingMob.faction && !A?.statistic_exempt) //One human shot another, be worried about it but do everything basically the same //special_role should be null or an empty string if done correctly
if(!istype(P.ammo, /datum/ammo/energy/taser))
- round_statistics.total_friendly_fire_instances++
+ GLOB.round_statistics.total_friendly_fire_instances++
var/ff_msg = "[key_name(firingMob)] shot [key_name(src)] with \a [P.name] in [get_area(firingMob)] [ADMIN_JMP(firingMob)] [ADMIN_PM(firingMob)]"
var/ff_living = TRUE
if(src.stat == DEAD)
diff --git a/code/modules/reagents/Chemistry-Generator.dm b/code/modules/reagents/Chemistry-Generator.dm
index bb8f69b714b2..b2e6402d4b06 100644
--- a/code/modules/reagents/Chemistry-Generator.dm
+++ b/code/modules/reagents/Chemistry-Generator.dm
@@ -75,56 +75,56 @@
if(my_chemid) //Do we want a specific chem?
chem_id = my_chemid
else if(class) //do we want a specific class?
- chem_id = pick(chemical_gen_classes_list["C[class]"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C[class]"])
else
var/roll = rand(0,100)
switch(tier)
if(0)
- chem_id = pick(chemical_gen_classes_list["C"])//If tier is 0, we can add any classed chemical
+ chem_id = pick(GLOB.chemical_gen_classes_list["C"])//If tier is 0, we can add any classed chemical
if(1)
if(roll<=35)
- chem_id = pick(chemical_gen_classes_list["C1"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C1"])
else if(roll<=65)
- chem_id = pick(chemical_gen_classes_list["C2"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C2"])
else if(roll<=85)
- chem_id = pick(chemical_gen_classes_list["C3"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C3"])
else
- chem_id = pick(chemical_gen_classes_list["C4"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C4"])
if(2)
if(roll<=30)
- chem_id = pick(chemical_gen_classes_list["C1"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C1"])
else if(roll<=55)
- chem_id = pick(chemical_gen_classes_list["C2"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C2"])
else if(roll<=70)
- chem_id = pick(chemical_gen_classes_list["C3"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C3"])
else
- chem_id = pick(chemical_gen_classes_list["C4"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C4"])
if(3)
if(roll<=10)
- chem_id = pick(chemical_gen_classes_list["C1"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C1"])
else if(roll<=30)
- chem_id = pick(chemical_gen_classes_list["C2"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C2"])
else if(roll<=50)
- chem_id = pick(chemical_gen_classes_list["C3"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C3"])
else if(roll<=70)
- chem_id = pick(chemical_gen_classes_list["C4"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C4"])
else
- chem_id = pick(chemical_gen_classes_list["C5"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C5"])
else
if(!required_reagents || is_catalyst)//first component is more likely to be special in chems tier 4 or higher, catalysts are always special in tier 4 or higher
if (prob(50))
- chem_id = pick(chemical_gen_classes_list["C5"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C5"])
else
- chem_id = pick(chemical_gen_classes_list["C4"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C4"])
else if(roll<=15)
- chem_id = pick(chemical_gen_classes_list["C2"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C2"])
else if(roll<=40)
- chem_id = pick(chemical_gen_classes_list["C3"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C3"])
else if(roll<=65)
- chem_id = pick(chemical_gen_classes_list["C4"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C4"])
else
- chem_id = pick(chemical_gen_classes_list["C5"])
+ chem_id = pick(GLOB.chemical_gen_classes_list["C5"])
//if we are already using this reagent, try again
if(required_reagents && required_reagents.Find(chem_id))
@@ -169,7 +169,7 @@
while(!gen_name)
gen_name = addtext(pick(prefix),pick(wordroot),pick(suffix))
//Make sure this name is not already used
- for(var/datum/reagent/R in chemical_reagents_list)
+ for(var/datum/reagent/R in GLOB.chemical_reagents_list)
if(R.name == gen_name)//if we are already using this name, try again
gen_name = ""
//set name
@@ -249,58 +249,58 @@
var/property
var/roll = rand(1,100)
if(make_rare)
- property = pick(chemical_properties_list["rare"])
+ property = pick(GLOB.chemical_properties_list["rare"])
//Pick the property by value and roll
else if(value_offset > 0) //Balance the value of our chemical
- property = pick(chemical_properties_list["positive"])
+ property = pick(GLOB.chemical_properties_list["positive"])
else if(value_offset < 0)
if(roll <= gen_tier*10)
- property = pick(chemical_properties_list["negative"])
+ property = pick(GLOB.chemical_properties_list["negative"])
else
- property = pick(chemical_properties_list["neutral"])
+ property = pick(GLOB.chemical_properties_list["neutral"])
else
switch(gen_tier)
if(1)
if(roll<=20)
- property = pick(chemical_properties_list["negative"])
+ property = pick(GLOB.chemical_properties_list["negative"])
else if (roll<=50)
- property = pick(chemical_properties_list["neutral"])
+ property = pick(GLOB.chemical_properties_list["neutral"])
else
- property = pick(chemical_properties_list["positive"])
+ property = pick(GLOB.chemical_properties_list["positive"])
if(2)
if(roll<=25)
- property = pick(chemical_properties_list["negative"])
+ property = pick(GLOB.chemical_properties_list["negative"])
else if (roll<=45)
- property = pick(chemical_properties_list["neutral"])
+ property = pick(GLOB.chemical_properties_list["neutral"])
else
- property = pick(chemical_properties_list["positive"])
+ property = pick(GLOB.chemical_properties_list["positive"])
if(3)
if(roll<=15)
- property = pick(chemical_properties_list["negative"])
+ property = pick(GLOB.chemical_properties_list["negative"])
else if (roll<=40)
- property = pick(chemical_properties_list["neutral"])
+ property = pick(GLOB.chemical_properties_list["neutral"])
else
- property = pick(chemical_properties_list["positive"])
+ property = pick(GLOB.chemical_properties_list["positive"])
else
if(roll<=15)
- property = pick(chemical_properties_list["negative"])
+ property = pick(GLOB.chemical_properties_list["negative"])
else if (roll<=40)
- property = pick(chemical_properties_list["neutral"])
+ property = pick(GLOB.chemical_properties_list["neutral"])
else
- property = pick(chemical_properties_list["positive"])
+ property = pick(GLOB.chemical_properties_list["positive"])
if(track_added_properties) //Generated effects are more unique for lower-tier chemicals, but not higher-tier ones
var/property_checks = 0
while(!check_generated_properties(property) && property_checks < 4)
property_checks++
- if(LAZYISIN(chemical_properties_list["negative"], property))
- property = pick(chemical_properties_list["negative"])
- else if(LAZYISIN(chemical_properties_list["neutral"], property))
- property = pick(chemical_properties_list["neutral"])
+ if(LAZYISIN(GLOB.chemical_properties_list["negative"], property))
+ property = pick(GLOB.chemical_properties_list["negative"])
+ else if(LAZYISIN(GLOB.chemical_properties_list["neutral"], property))
+ property = pick(GLOB.chemical_properties_list["neutral"])
else
- property = pick(chemical_properties_list["positive"])
+ property = pick(GLOB.chemical_properties_list["positive"])
- var/datum/chem_property/P = chemical_properties_list[property]
+ var/datum/chem_property/P = GLOB.chemical_properties_list[property]
//Calculate what our chemical value is with our level
var/new_value
@@ -389,7 +389,7 @@
return FALSE
break
//Insert the property
- var/datum/chem_property/P = chemical_properties_list[property]
+ var/datum/chem_property/P = GLOB.chemical_properties_list[property]
P = new P.type()
P.level = level
P.holder = src
@@ -397,7 +397,7 @@
//Special case: If it's a catalyst property, add it nonetheless.
if(initial_property && initial_property != property)
- P = chemical_properties_list[initial_property]
+ P = GLOB.chemical_properties_list[initial_property]
if(P.category & PROPERTY_TYPE_CATALYST)
P = new P.type()
P.level = level
@@ -425,22 +425,22 @@
C.gen_tier = gen_tier
if(!C.generate_recipe(complexity))
return //Generating a recipe failed, so return null
- chemical_reactions_list[C.id] = C
+ GLOB.chemical_reactions_list[C.id] = C
C.add_to_filtered_list()
return C
//Returns false if a property has been generated in a previous reagent and all properties of that category haven't been generated yet.
/datum/reagent/proc/check_generated_properties(datum/chem_property/P)
- if(LAZYISIN(chemical_properties_list["positive"], P))
- if(LAZYISIN(GLOB.generated_properties["positive"], P) && LAZYLEN(GLOB.generated_properties["positive"]) < LAZYLEN(chemical_properties_list["positive"]))
+ if(LAZYISIN(GLOB.chemical_properties_list["positive"], P))
+ if(LAZYISIN(GLOB.generated_properties["positive"], P) && LAZYLEN(GLOB.generated_properties["positive"]) < LAZYLEN(GLOB.chemical_properties_list["positive"]))
return FALSE
GLOB.generated_properties["positive"] += P
- else if(LAZYISIN(chemical_properties_list["negative"], P))
- if(LAZYISIN(GLOB.generated_properties["negative"], P) && LAZYLEN(GLOB.generated_properties["negative"]) < LAZYLEN(chemical_properties_list["negative"]))
+ else if(LAZYISIN(GLOB.chemical_properties_list["negative"], P))
+ if(LAZYISIN(GLOB.generated_properties["negative"], P) && LAZYLEN(GLOB.generated_properties["negative"]) < LAZYLEN(GLOB.chemical_properties_list["negative"]))
return FALSE
GLOB.generated_properties["negative"] += P
- else if(LAZYISIN(chemical_properties_list["neutral"], P))
- if(LAZYISIN(GLOB.generated_properties["neutral"], P) && LAZYLEN(GLOB.generated_properties["neutral"]) < LAZYLEN(chemical_properties_list["neutral"]))
+ else if(LAZYISIN(GLOB.chemical_properties_list["neutral"], P))
+ if(LAZYISIN(GLOB.generated_properties["neutral"], P) && LAZYLEN(GLOB.generated_properties["neutral"]) < LAZYLEN(GLOB.chemical_properties_list["neutral"]))
return FALSE
GLOB.generated_properties["neutral"] += P
return TRUE
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 2c08e9f4e693..dcb949424bdf 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -25,7 +25,7 @@
maximum_volume = maximum
#ifdef UNIT_TESTS
- if(!chemical_reagents_list || !chemical_reactions_filtered_list || !chemical_properties_list)
+ if(!GLOB.chemical_reagents_list || !GLOB.chemical_reactions_filtered_list || !GLOB.chemical_properties_list)
CRASH("Chemistry reagents are not set up!")
#endif
@@ -240,7 +240,7 @@
O.volume += R.volume
qdel(R)
break
- for(var/reaction in chemical_reactions_filtered_list[R.id]) // Was a big list but now it should be smaller since we filtered it with our reagent id
+ for(var/reaction in GLOB.chemical_reactions_filtered_list[R.id]) // Was a big list but now it should be smaller since we filtered it with our reagent id
if(!reaction)
continue
@@ -417,10 +417,10 @@
handle_reactions()
return FALSE
- var/datum/reagent/D = chemical_reagents_list[reagent]
+ var/datum/reagent/D = GLOB.chemical_reagents_list[reagent]
if(D)
if(!istype(D, /datum/reagent))
- CRASH("Not REAGENT - [reagent] - chemical_reagents_list[reagent]")
+ CRASH("Not REAGENT - [reagent] - GLOB.chemical_reagents_list[reagent]")
var/datum/reagent/R = new D.type()
if(D.type == /datum/reagent/generated)
diff --git a/code/modules/reagents/Chemistry-Reactions.dm b/code/modules/reagents/Chemistry-Reactions.dm
index 1d9c03f9e923..7a8f0b21158a 100644
--- a/code/modules/reagents/Chemistry-Reactions.dm
+++ b/code/modules/reagents/Chemistry-Reactions.dm
@@ -22,15 +22,15 @@
/datum/chemical_reaction/proc/add_to_filtered_list(reset = FALSE)
if(reset)
- for(var/R in chemical_reactions_filtered_list)
- LAZYREMOVE(chemical_reactions_filtered_list[R], src)
+ for(var/R in GLOB.chemical_reactions_filtered_list)
+ LAZYREMOVE(GLOB.chemical_reactions_filtered_list[R], src)
for(var/R in required_reagents)
- LAZYADD(chemical_reactions_filtered_list[R], src)
+ LAZYADD(GLOB.chemical_reactions_filtered_list[R], src)
/datum/chemical_reaction/proc/check_duplicate()
for(var/R in required_reagents)
- if(chemical_reactions_filtered_list[R])
- for(var/reaction in chemical_reactions_filtered_list[R])//We filter the chemical_reactions_filtered_list so we don't have to search through as much
+ if(GLOB.chemical_reactions_filtered_list[R])
+ for(var/reaction in GLOB.chemical_reactions_filtered_list[R])//We filter the GLOB.chemical_reactions_filtered_list so we don't have to search through as much
var/datum/chemical_reaction/C = reaction
var/matches = 0
for(var/B in required_reagents)
@@ -43,7 +43,7 @@
// To prevent such a situation, if ALL reagent inside a reaction are medical chemicals, the recipe is considered flawed.
/datum/chemical_reaction/proc/check_reaction_uses_all_default_medical()
for(var/R in required_reagents)
- var/datum/reagent/M = chemical_reagents_list[R]
+ var/datum/reagent/M = GLOB.chemical_reagents_list[R]
if(!(initial(M.flags) & REAGENT_TYPE_MEDICAL))
return FALSE
return TRUE
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 7f659c54c40d..6d36765146ed 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -267,37 +267,37 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
if(chemclass && !(flags & REAGENT_NO_GENERATION))
switch(chemclass)
if(CHEM_CLASS_BASIC)
- chemical_gen_classes_list["C1"] += id
+ GLOB.chemical_gen_classes_list["C1"] += id
if(CHEM_CLASS_COMMON)
- chemical_gen_classes_list["C2"] += id
+ GLOB.chemical_gen_classes_list["C2"] += id
if(CHEM_CLASS_UNCOMMON)
- chemical_gen_classes_list["C3"] += id
+ GLOB.chemical_gen_classes_list["C3"] += id
if(CHEM_CLASS_RARE)
- chemical_gen_classes_list["C4"] += id
+ GLOB.chemical_gen_classes_list["C4"] += id
if(CHEM_CLASS_SPECIAL)
- chemical_gen_classes_list["C5"] += id
- chemical_data.add_chemical_objective(src)
+ GLOB.chemical_gen_classes_list["C5"] += id
+ GLOB.chemical_data.add_chemical_objective(src)
if(CHEM_CLASS_ULTRA)
- chemical_gen_classes_list["C6"] += id
- chemical_data.add_chemical_objective(src)
- chemical_gen_classes_list["C"] += id
+ GLOB.chemical_gen_classes_list["C6"] += id
+ GLOB.chemical_data.add_chemical_objective(src)
+ GLOB.chemical_gen_classes_list["C"] += id
if(gen_tier)
switch(gen_tier)
if(1)
- chemical_gen_classes_list["T1"] += id
+ GLOB.chemical_gen_classes_list["T1"] += id
if(2)
- chemical_gen_classes_list["T2"] += id
+ GLOB.chemical_gen_classes_list["T2"] += id
if(3)
- chemical_gen_classes_list["T3"] += id
+ GLOB.chemical_gen_classes_list["T3"] += id
if(4)
- chemical_gen_classes_list["T4"] += id
+ GLOB.chemical_gen_classes_list["T4"] += id
if(5)
- chemical_gen_classes_list["T5"] += id
+ GLOB.chemical_gen_classes_list["T5"] += id
/datum/reagent/proc/properties_to_datums()
#ifdef UNIT_TESTS
- if(!chemical_properties_list)
+ if(!GLOB.chemical_properties_list)
CRASH("Chemistry reagents are not set up!")
#endif
@@ -306,7 +306,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
if(istype(prop, /datum/chem_property))
new_properties += prop
continue
- var/datum/chem_property/chem = chemical_properties_list[prop]
+ var/datum/chem_property/chem = GLOB.chemical_properties_list[prop]
if(chem)
chem = new chem.type()
chem.level = properties[prop]
diff --git a/code/modules/reagents/chemical_research/Chemical-Research.dm b/code/modules/reagents/chemical_research/Chemical-Research.dm
index 0b1152154dc3..e66cb474df50 100644
--- a/code/modules/reagents/chemical_research/Chemical-Research.dm
+++ b/code/modules/reagents/chemical_research/Chemical-Research.dm
@@ -1,4 +1,4 @@
-var/global/datum/chemical_data/chemical_data = new /datum/chemical_data
+GLOBAL_DATUM_INIT(chemical_data, /datum/chemical_data, new)
/datum/chemical_data
var/rsc_credits = 0
@@ -38,7 +38,7 @@ var/global/datum/chemical_data/chemical_data = new /datum/chemical_data
/datum/chemical_data/proc/get_report(doc_type, doc_title)
var/obj/item/paper/research_report/report = null
- for(var/document_data in chemical_data.research_documents[doc_type])
+ for(var/document_data in GLOB.chemical_data.research_documents[doc_type])
if(document_data["document_title"] == doc_title)
report = document_data["document"]
break
@@ -92,7 +92,7 @@ var/global/datum/chemical_data/chemical_data = new /datum/chemical_data
if(LAZYLEN(property_names))
has_new_properties = TRUE
for(var/name in property_names)
- var/datum/chem_property/ref = chemical_properties_list[name]
+ var/datum/chem_property/ref = GLOB.chemical_properties_list[name]
var/datum/chem_property/P = new ref.type
P.level = 0
research_property_data += P
@@ -146,7 +146,7 @@ var/global/datum/chemical_data/chemical_data = new /datum/chemical_data
chemical_not_completed_objective_list[chem.id] = chem.objective_value
/datum/chemical_data/proc/get_tgui_data(chemid)
- var/datum/reagent/chem = chemical_reagents_list[chemid]
+ var/datum/reagent/chem = GLOB.chemical_reagents_list[chemid]
if(!chem)
error("Invalid chemid [chemid]")
return
diff --git a/code/modules/reagents/chemical_research/generated_reagents.dm b/code/modules/reagents/chemical_research/generated_reagents.dm
index 6eaa664b6d7e..a21d74e26f8a 100644
--- a/code/modules/reagents/chemical_research/generated_reagents.dm
+++ b/code/modules/reagents/chemical_research/generated_reagents.dm
@@ -16,21 +16,21 @@
//Generate stats
if(!id) //So we can initiate a new datum without generating it
return
- if(!chemical_reagents_list[id])
+ if(!GLOB.chemical_reagents_list[id])
generate_name()
generate_stats()
- chemical_reagents_list[id] = src
- make_alike(chemical_reagents_list[id])
+ GLOB.chemical_reagents_list[id] = src
+ make_alike(GLOB.chemical_reagents_list[id])
recalculate_variables()
/datum/chemical_reaction/generated/New()
//Generate recipe
if(!id) //So we can initiate a new datum without generating it
return
- if(!chemical_reactions_list[id])
+ if(!GLOB.chemical_reactions_list[id])
generate_recipe()
- chemical_reactions_list[id] = src
- make_alike(chemical_reactions_list[id])
+ GLOB.chemical_reactions_list[id] = src
+ make_alike(GLOB.chemical_reactions_list[id])
/////////Tier 1
/datum/chemical_reaction/generated/alpha
diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm
index 6778bdd3c72b..85ed21543127 100644
--- a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm
@@ -59,7 +59,7 @@
/obj/structure/machinery/chem_dispenser/process()
if(!chem_storage)
- chem_storage = chemical_data.connect_chem_storage(network)
+ chem_storage = GLOB.chemical_data.connect_chem_storage(network)
/obj/structure/machinery/chem_dispenser/Initialize()
. = ..()
@@ -68,7 +68,7 @@
/obj/structure/machinery/chem_dispenser/Destroy()
if(!chem_storage)
- chem_storage = chemical_data.disconnect_chem_storage(network)
+ chem_storage = GLOB.chemical_data.disconnect_chem_storage(network)
return ..()
/obj/structure/machinery/chem_dispenser/ex_act(severity)
@@ -155,7 +155,7 @@
var/list/chemicals = list()
for(var/re in dispensable_reagents)
- var/datum/reagent/temp = chemical_reagents_list[re]
+ var/datum/reagent/temp = GLOB.chemical_reagents_list[re]
if(temp)
var/chemname = temp.name
chemicals.Add(list(list("title" = chemname, "id" = temp.id)))
diff --git a/code/modules/reagents/chemistry_machinery/chem_simulator.dm b/code/modules/reagents/chemistry_machinery/chem_simulator.dm
index 2c8602b0dab7..1debbc56b495 100644
--- a/code/modules/reagents/chemistry_machinery/chem_simulator.dm
+++ b/code/modules/reagents/chemistry_machinery/chem_simulator.dm
@@ -62,7 +62,7 @@
..()
if(inoperable())
icon_state = "modifier_off"
- nanomanager.update_uis(src) // update all UIs attached to src
+ SSnano.nanomanager.update_uis(src) // update all UIs attached to src
/obj/structure/machinery/chem_simulator/attackby(obj/item/B, mob/living/user)
if(!skillcheck(user, SKILL_RESEARCH, SKILL_RESEARCH_TRAINED))
@@ -93,7 +93,7 @@
to_chat(user, SPAN_NOTICE("You insert [B] into the [src]."))
flick("[icon_state]_reading",src)
update_costs()
- nanomanager.update_uis(src) // update all UIs attached to src
+ SSnano.nanomanager.update_uis(src) // update all UIs attached to src
/obj/structure/machinery/chem_simulator/attack_hand(mob/user as mob)
if(inoperable())
@@ -105,7 +105,7 @@
/obj/structure/machinery/chem_simulator/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
var/list/data = list(
- "rsc_credits" = chemical_data.rsc_credits,
+ "rsc_credits" = GLOB.chemical_data.rsc_credits,
"target" = target,
"reference" = reference,
"mode" = mode,
@@ -122,7 +122,7 @@
if(simulating == SIMULATION_STAGE_FINAL)
for(var/reagent_id in recipe_targets)
- var/datum/reagent/R = chemical_reagents_list[reagent_id]
+ var/datum/reagent/R = GLOB.chemical_reagents_list[reagent_id]
var/list/id_name[0]
id_name["[R.id]"] = R.name
data["recipe_targets"] += id_name
@@ -134,7 +134,7 @@
//List of all available properties
data["property_data_list"] = list()
- for(var/datum/chem_property/P in chemical_data.research_property_data)
+ for(var/datum/chem_property/P in GLOB.chemical_data.research_property_data)
data["property_codings"][P.name] = P.code
if(template_filter && !check_bitflag(P.category, template_filter))
continue
@@ -182,7 +182,7 @@
else
data["reference_info"] = ""
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ ui = SSnano.nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if(!ui)
ui = new(user, src, ui_key, "chem_simulator.tmpl", "Synthesis Simulator", 800, 550)
ui.set_initial_data(data)
@@ -198,7 +198,7 @@
if(user.stat || user.is_mob_restrained() || !in_range(src, user))
return
- if(mode == MODE_CREATE && chemical_data.has_new_properties)
+ if(mode == MODE_CREATE && GLOB.chemical_data.has_new_properties)
update_costs()
if(href_list["simulate"] && ready)
@@ -252,7 +252,7 @@
return
if(mode == MODE_CREATE)
var/target_name = href_list["set_target"]
- for(var/datum/chem_property/P in chemical_data.research_property_data)
+ for(var/datum/chem_property/P in GLOB.chemical_data.research_property_data)
if(P.name == target_name)
if(target_property && target_property.name == target_name)
//Toggle the property
@@ -294,15 +294,15 @@
newname = reject_bad_name(newname, TRUE, 20, FALSE)
if(isnull(newname))
to_chat(user, "Bad name.")
- else if(chemical_reagents_list[newname])
+ else if(GLOB.chemical_reagents_list[newname])
to_chat(user, "Name already taken.")
else
creation_name = newname
else if(href_list["set_level"] && target_property)
var/level_to_set = 1
- if(chemical_data.clearance_level <= 2)
+ if(GLOB.chemical_data.clearance_level <= 2)
level_to_set = tgui_input_list(usr, "Set target level for [target_property.name]:","[src]", list(1,2,3,4))
- else if(chemical_data.clearance_level <= 4)
+ else if(GLOB.chemical_data.clearance_level <= 4)
level_to_set = tgui_input_list(usr, "Set target level for [target_property.name]:","[src]", list(1,2,3,4,5,6,7,8))
else
level_to_set = tgui_input_list(usr, "Set target level for [target_property.name]:","[src]", list(1,2,3,4,5,6,7,8,9,10))
@@ -350,7 +350,7 @@
calculate_creation_cost()
ready = check_ready()
playsound(loc, pick('sound/machines/computer_typing1.ogg','sound/machines/computer_typing2.ogg','sound/machines/computer_typing3.ogg'), 5, 1)
- nanomanager.update_uis(src)
+ SSnano.nanomanager.update_uis(src)
/obj/structure/machinery/chem_simulator/process()
if(inoperable())
@@ -384,7 +384,7 @@
C.name = C.id
if(C.id in simulations)
//We've already simulated this before, so we don't need to continue
- C = chemical_reagents_list[C.id]
+ C = GLOB.chemical_reagents_list[C.id]
print(C.id)
status_bar = "SIMULATION COMPLETE"
simulating = SIMULATION_STAGE_OFF
@@ -398,13 +398,13 @@
else
ready = check_ready()
stop_processing()
- nanomanager.update_uis(src)
+ SSnano.nanomanager.update_uis(src)
/obj/structure/machinery/chem_simulator/proc/update_costs()
property_costs = list()
var/only_positive = TRUE
if(mode == MODE_CREATE)
- for(var/datum/chem_property/P in chemical_data.research_property_data)
+ for(var/datum/chem_property/P in GLOB.chemical_data.research_property_data)
property_costs[P.name] = max(abs(P.value), 1)
else if(target && target.data && target.completed)
for(var/datum/chem_property/P in target.data.properties)
@@ -431,7 +431,7 @@
if(only_positive)
for(var/P in property_costs)
property_costs[P] = property_costs[P] + 1
- chemical_data.has_new_properties = FALSE
+ GLOB.chemical_data.has_new_properties = FALSE
//Here the cost for creating a chemical is calculated. If you're looking to rebalance create mode, this is where you do it
/obj/structure/machinery/chem_simulator/proc/calculate_creation_cost()
@@ -468,7 +468,7 @@
new_od_level = max(new_od_level - 5, 5)
/obj/structure/machinery/chem_simulator/proc/prepare_recipe_options()
- var/datum/chemical_reaction/generated/O = chemical_reactions_list[target.data.id]
+ var/datum/chemical_reaction/generated/O = GLOB.chemical_reactions_list[target.data.id]
if(!O) //If it doesn't have a recipe, go immediately to finalizing, which will then generate a new associated recipe
return FALSE
recipe_targets = list() //reset
@@ -481,7 +481,7 @@
if(LAZYLEN(R.required_reagents) > 2)
LAZYREMOVE(R.required_reagents, pick(R.required_reagents))
var/new_component_id = R.add_component(tier = max(min(target.data.chemclass, CHEM_CLASS_COMMON), target.data.gen_tier, 1))
- var/datum/reagent/new_component = chemical_reagents_list[new_component_id]
+ var/datum/reagent/new_component = GLOB.chemical_reagents_list[new_component_id]
//Make sure we don't have an identical reaction and that the component is identified
if(R.check_duplicate() || R.check_reaction_uses_all_default_medical() || new_component.chemclass >= CHEM_CLASS_SPECIAL)
R.required_reagents = old_reaction.Copy()
@@ -512,27 +512,27 @@
status_bar = "TARGET CAN NOT BE ALTERED"
return FALSE
//Safety check in case of irregular papers
- var/datum/chemical_reaction/C = chemical_reactions_list[target.data.id]
+ var/datum/chemical_reaction/C = GLOB.chemical_reactions_list[target.data.id]
if(C)
for(var/component in C.required_reagents)
- var/datum/reagent/R = chemical_reagents_list[component]
- if(R && R.chemclass >= CHEM_CLASS_SPECIAL && !chemical_data.chemical_identified_list[R.id])
+ var/datum/reagent/R = GLOB.chemical_reagents_list[component]
+ if(R && R.chemclass >= CHEM_CLASS_SPECIAL && !GLOB.chemical_data.chemical_identified_list[R.id])
status_bar = "UNREGISTERED COMPONENTS DETECTED"
return FALSE
for(var/catalyst in C.required_catalysts)
- var/datum/reagent/R = chemical_reagents_list[catalyst]
- if(R && R.chemclass >= CHEM_CLASS_SPECIAL && !chemical_data.chemical_identified_list[R.id])
+ var/datum/reagent/R = GLOB.chemical_reagents_list[catalyst]
+ if(R && R.chemclass >= CHEM_CLASS_SPECIAL && !GLOB.chemical_data.chemical_identified_list[R.id])
status_bar = "UNREGISTERED CATALYSTS DETECTED"
return FALSE
if(target_property)
- if(property_costs[target_property.name] > chemical_data.rsc_credits)
+ if(property_costs[target_property.name] > GLOB.chemical_data.rsc_credits)
status_bar = "INSUFFICIENT FUNDS"
return FALSE
if(target_property.category & PROPERTY_TYPE_UNADJUSTABLE)
status_bar = "TARGET PROPERTY CAN NOT BE SIMULATED"
return FALSE
if(mode == MODE_AMPLIFY)
- if(target_property.level >= chemical_data.clearance_level*TECHTREE_LEVEL_MULTIPLIER + 2 && chemical_data.clearance_level < 5)
+ if(target_property.level >= GLOB.chemical_data.clearance_level*TECHTREE_LEVEL_MULTIPLIER + 2 && GLOB.chemical_data.clearance_level < 5)
status_bar = "CLEARANCE INSUFFICIENT FOR AMPLIFICATION"
return FALSE
if(target && length(target.data.properties) < 2)
@@ -560,7 +560,7 @@
if(LAZYLEN(creation_name) < 2)
status_bar = "NAME NOT SET"
return FALSE
- if(creation_cost > chemical_data.rsc_credits)
+ if(creation_cost > GLOB.chemical_data.rsc_credits)
status_bar = "INSUFFICIENT FUNDS"
return FALSE
else if(!target)
@@ -575,18 +575,18 @@
flick("[icon_state]_printing",src)
sleep(10)
var/obj/item/paper/research_report/report = new /obj/item/paper/research_report/(loc)
- var/datum/reagent/D = chemical_reagents_list[id]
+ var/datum/reagent/D = GLOB.chemical_reagents_list[id]
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
report.name = "Simulation result for [D.name]"
report.info += "
Official Company Document
Simulated Synthesis Report
Result for [D.name]
"
report.generate(D)
- report.info += "
This report was automatically printed by the Synthesis Simulator.
The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[game_year], [worldtime2text()]
\n"
+ report.info += "
This report was automatically printed by the Synthesis Simulator.
The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[GLOB.game_year], [worldtime2text()]
\n"
playsound(loc, 'sound/machines/twobeep.ogg', 15, 1)
if(is_new)
- chemical_data.save_document(report, "Synthesis Simulations", report.name)
+ GLOB.chemical_data.save_document(report, "Synthesis Simulations", report.name)
/obj/structure/machinery/chem_simulator/proc/encode_reagent(datum/reagent/C)
- var/datum/reagent/O = chemical_reagents_list[C.original_id] //So make the new name based on the Original
+ var/datum/reagent/O = GLOB.chemical_reagents_list[C.original_id] //So make the new name based on the Original
var/suffix = " "
for(var/datum/chem_property/P in C.properties)
suffix += P.code+"[P.level]"
@@ -661,7 +661,7 @@
R.gen_tier = C.gen_tier
if(mode != MODE_CREATE)
- assoc_R = chemical_reactions_list[target.data.id]
+ assoc_R = GLOB.chemical_reactions_list[target.data.id]
if(!assoc_R) //no associated recipe found
if(mode == MODE_CREATE)
assoc_R = C.generate_assoc_recipe(creation_complexity)
@@ -690,25 +690,25 @@
//Pay
if(mode == MODE_CREATE)
- chemical_data.update_credits(creation_cost * -1)
+ GLOB.chemical_data.update_credits(creation_cost * -1)
else
- chemical_data.update_credits(property_costs[target_property.name] * -1)
+ GLOB.chemical_data.update_credits(property_costs[target_property.name] * -1)
//Refund 1 credit if a rare or rarer target was added
- var/datum/reagent/component = chemical_reagents_list[recipe_target]
+ var/datum/reagent/component = GLOB.chemical_reagents_list[recipe_target]
if(component && component.chemclass >= CHEM_CLASS_RARE)
- chemical_data.update_credits(1)
+ GLOB.chemical_data.update_credits(1)
//Save the reagent
C.generate_description()
C.chemclass = CHEM_CLASS_RARE //So that we can always scan this in the future, don't generate defcon, and don't get a loop of making credits
- chemical_reagents_list[C.id] = C
+ GLOB.chemical_reagents_list[C.id] = C
LAZYADD(simulations, C.id) //Remember we've simulated this
//Save the reaction
R.id = C.id
R.result = C.id
- chemical_reactions_list[R.id] = R
+ GLOB.chemical_reactions_list[R.id] = R
R.add_to_filtered_list()
status_bar = "SIMULATION COMPLETE"
print(C.id, TRUE)
diff --git a/code/modules/reagents/chemistry_machinery/chem_storage.dm b/code/modules/reagents/chemistry_machinery/chem_storage.dm
index 3a05201dea25..692daef7864f 100644
--- a/code/modules/reagents/chemistry_machinery/chem_storage.dm
+++ b/code/modules/reagents/chemistry_machinery/chem_storage.dm
@@ -31,11 +31,11 @@
/obj/structure/machinery/chem_storage/Initialize()
. = ..()
- chemical_data.add_chem_storage(src)
+ GLOB.chemical_data.add_chem_storage(src)
start_processing()
/obj/structure/machinery/chem_storage/Destroy()
- chemical_data.remove_chem_storage(src)
+ GLOB.chemical_data.remove_chem_storage(src)
return ..()
/obj/structure/machinery/chem_storage/get_examine_text(mob/user)
diff --git a/code/modules/reagents/chemistry_machinery/pandemic.dm b/code/modules/reagents/chemistry_machinery/pandemic.dm
index c9e34f79609e..5cd7f6584705 100644
--- a/code/modules/reagents/chemistry_machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry_machinery/pandemic.dm
@@ -59,10 +59,10 @@
if(B)
var/datum/disease/D = null
if(!vaccine_type)
- D = archive_diseases[path]
+ D = GLOB.archive_diseases[path]
vaccine_type = path
else
- if(vaccine_type in diseases)
+ if(vaccine_type in GLOB.diseases)
D = new vaccine_type(0, null)
if(D)
@@ -90,11 +90,11 @@
B.icon_state = "bottle3"
var/datum/disease/D = null
if(!virus_type)
- var/datum/disease/advance/A = archive_diseases[href_list["create_virus_culture"]]
+ var/datum/disease/advance/A = GLOB.archive_diseases[href_list["create_virus_culture"]]
if(A)
D = new A.type(0, A)
else
- if(virus_type in diseases) // Make sure this is a disease
+ if(virus_type in GLOB.diseases) // Make sure this is a disease
D = new virus_type(0, null)
var/list/data = list("viruses"=list(D))
var/name = strip_html(input(user,"Name:","Name the culture",D.name))
@@ -129,8 +129,8 @@
if(user.stat || user.is_mob_restrained()) return
if(!in_range(src, user)) return
var/id = href_list["name_disease"]
- if(archive_diseases[id])
- var/datum/disease/advance/A = archive_diseases[id]
+ if(GLOB.archive_diseases[id])
+ var/datum/disease/advance/A = GLOB.archive_diseases[id]
A.AssignName(new_name)
for(var/datum/disease/advance/AD in SSdisease.all_diseases)
AD.Refresh()
@@ -184,7 +184,7 @@
if(istype(D, /datum/disease/advance))
var/datum/disease/advance/A = D
- D = archive_diseases[A.GetDiseaseID()]
+ D = GLOB.archive_diseases[A.GetDiseaseID()]
disease_creation = A.GetDiseaseID()
if(D.name == "Unknown")
dat += "Name Disease
"
@@ -216,7 +216,7 @@
var/disease_name = "Unknown"
if(!ispath(type))
- var/datum/disease/advance/A = archive_diseases[type]
+ var/datum/disease/advance/A = GLOB.archive_diseases[type]
if(A)
disease_name = A.name
else
diff --git a/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm b/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm
index dc1f72ec41c7..de059de46436 100644
--- a/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm
+++ b/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm
@@ -89,27 +89,27 @@
var/datum/reagent/S = sample.reagents.reagent_list[1]
S.print_report(report = report, sample_number = sample_number)
sample.name = "vial ([S.name])"
- chemical_data.save_document(report, "XRF Scans", "[sample_number] - [report.name]")
+ GLOB.chemical_data.save_document(report, "XRF Scans", "[sample_number] - [report.name]")
if(S.chemclass < CHEM_CLASS_SPECIAL || (S.chemclass >= CHEM_CLASS_SPECIAL && report.completed))
- chemical_data.save_new_properties(S.properties)
- if(S.chemclass >= CHEM_CLASS_SPECIAL && !chemical_data.chemical_identified_list[S.id])
+ GLOB.chemical_data.save_new_properties(S.properties)
+ if(S.chemclass >= CHEM_CLASS_SPECIAL && !GLOB.chemical_data.chemical_identified_list[S.id])
if(last_used)
last_used.count_niche_stat(STATISTICS_NICHE_CHEMS)
var/datum/chem_property/P = S.get_property(PROPERTY_DNA_DISINTEGRATING)
if(P)
- if(chemical_data.clearance_level >= S.gen_tier)
+ if(GLOB.chemical_data.clearance_level >= S.gen_tier)
P.trigger()
else
return
- chemical_data.complete_chemical(S)
+ GLOB.chemical_data.complete_chemical(S)
else
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
report.name = "Analysis of ERROR"
report.info += "
Official Weyland-Yutani Document
Reagent Analysis Print
Analysis ERROR
"
report.info += "Result:
Analysis failed for sample #[sample_number].
\n"
report.info += "Reason for error:
[reason]
\n"
- report.info += "
This report was automatically printed by the A-XRF Scanner.
The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[game_year], [worldtime2text()]
\n"
+ report.info += "
This report was automatically printed by the A-XRF Scanner.
The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[GLOB.game_year], [worldtime2text()]
\n"
/datum/reagent/proc/print_report(turf/loc, obj/item/paper/research_report/report, admin_spawned = FALSE, sample_number = 0)
if(!report)
diff --git a/code/modules/reagents/chemistry_properties/prop_neutral.dm b/code/modules/reagents/chemistry_properties/prop_neutral.dm
index d420623879ce..a35fb5e554bf 100644
--- a/code/modules/reagents/chemistry_properties/prop_neutral.dm
+++ b/code/modules/reagents/chemistry_properties/prop_neutral.dm
@@ -200,7 +200,7 @@
/datum/chem_property/neutral/hallucinogenic/process_overdose(mob/living/M, potency = 1, delta_time)
if(isturf(M.loc) && !istype(M.loc, /turf/open/space) && M.canmove && !M.is_mob_restrained())
- step(M, pick(cardinal))
+ step(M, pick(GLOB.cardinals))
M.hallucination += 10
M.make_jittery(5)
diff --git a/code/modules/reagents/chemistry_properties/prop_special.dm b/code/modules/reagents/chemistry_properties/prop_special.dm
index cec04ca66616..52354f0d6b01 100644
--- a/code/modules/reagents/chemistry_properties/prop_special.dm
+++ b/code/modules/reagents/chemistry_properties/prop_special.dm
@@ -97,7 +97,7 @@
/datum/chem_property/special/DNA_Disintegrating/trigger()
SSticker.mode.get_specific_call("Weyland-Yutani Goon (Chemical Investigation Squad)", TRUE, FALSE, holder.name)
- chemical_data.update_credits(10)
+ GLOB.chemical_data.update_credits(10)
message_admins("The research department has discovered DNA_Disintegrating in [holder.name] adding 10 bonus tech points.")
var/datum/techtree/tree = GET_TREE(TREE_MARINE)
tree.add_points(10)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index b4b4f68ed99d..b468116da5f2 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -197,7 +197,7 @@
/obj/structure/machinery/conveyor_switch/LateInitialize()
. = ..()
conveyors = list()
- for(var/obj/structure/machinery/conveyor/C in machines)
+ for(var/obj/structure/machinery/conveyor/C in GLOB.machines)
if(C.id == id)
conveyors += C
start_processing()
@@ -246,7 +246,7 @@
update()
// find any switches with same id as this one, and set their positions to match us
- for(var/obj/structure/machinery/conveyor_switch/S in machines)
+ for(var/obj/structure/machinery/conveyor_switch/S in GLOB.machines)
if(S.id == src.id)
S.position = position
S.update()
@@ -266,7 +266,7 @@
update()
// find any switches with same id as this one, and set their positions to match us
- for(var/obj/structure/machinery/conveyor_switch/S in machines)
+ for(var/obj/structure/machinery/conveyor_switch/S in GLOB.machines)
if(S.id == src.id)
S.position = position
S.update()
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 2c7401ac278c..83c6d4516724 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -746,7 +746,7 @@
//Remains : set to leave broken pipe pieces in place
/obj/structure/disposalpipe/deconstruct(disassembled = TRUE)
if(disassembled)
- for(var/D in cardinal)
+ for(var/D in GLOB.cardinals)
if(D & dpdir)
var/obj/structure/disposalpipe/broken/P = new(loc)
P.setDir(D)
@@ -1096,7 +1096,8 @@
/obj/structure/disposalpipe/tagger/Initialize(mapload, ...)
. = ..()
dpdir = dir|turn(dir, 180)
- if(sort_tag) tagger_locations |= sort_tag
+ if(sort_tag)
+ GLOB.tagger_locations |= sort_tag
updatename()
updatedesc()
update()
@@ -1152,7 +1153,8 @@
/obj/structure/disposalpipe/sortjunction/Initialize(mapload, ...)
. = ..()
- if(sortType) tagger_locations |= sortType
+ if(sortType)
+ GLOB.tagger_locations |= sortType
updatedir()
updatename()
@@ -1457,7 +1459,7 @@
if(direction)
dirs = list( direction, turn(direction, -45), turn(direction, 45))
else
- dirs = alldirs.Copy()
+ dirs = GLOB.alldirs.Copy()
INVOKE_ASYNC(streak(dirs))
@@ -1466,7 +1468,7 @@
if(direction)
dirs = list( direction, turn(direction, -45), turn(direction, 45))
else
- dirs = alldirs.Copy()
+ dirs = GLOB.alldirs.Copy()
INVOKE_ASYNC(streak(dirs))
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index e8ac568140bc..ec1c8c245f2b 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -337,8 +337,8 @@
var/dat = "TagMaster 2.3
"
dat += ""
- for(var/i = 1, i <= tagger_locations.len, i++)
- dat += "| [tagger_locations[i]] | "
+ for(var/i = 1, i <= GLOB.tagger_locations.len, i++)
+ dat += "[GLOB.tagger_locations[i]] | "
if (i%4==0)
dat += "
"
@@ -357,7 +357,7 @@
if(.)
return
src.add_fingerprint(usr)
- if(href_list["nextTag"] && (href_list["nextTag"] in tagger_locations))
+ if(href_list["nextTag"] && (href_list["nextTag"] in GLOB.tagger_locations))
src.currTag = href_list["nextTag"]
openwindow(usr)
diff --git a/code/modules/round_recording/round_recorder.dm b/code/modules/round_recording/round_recorder.dm
index 677b32bba1d2..8748b995aa6c 100644
--- a/code/modules/round_recording/round_recorder.dm
+++ b/code/modules/round_recording/round_recorder.dm
@@ -31,8 +31,8 @@
game_start = time2text(world.realtime, "DD.MM.YYYY@hh:mm:ss")
map = SSmapping.configs[GROUND_MAP].map_name
- gamemode = master_mode
- round_name = round_statistics.name
+ gamemode = GLOB.master_mode
+ round_name = GLOB.round_statistics.name
// Record the end time of the game and export the game history
/datum/round_recorder/proc/end_game()
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index 9d6d862bfc3c..4b7cdd69a449 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -108,7 +108,7 @@
/obj/structure/machinery/keycard_auth/proc/broadcast_request()
icon_state = "auth_on"
- for(var/obj/structure/machinery/keycard_auth/KA in machines)
+ for(var/obj/structure/machinery/keycard_auth/KA in GLOB.machines)
if(KA == src || KA.channel != channel) continue
KA.reset()
INVOKE_ASYNC(KA, TYPE_PROC_REF(/obj/structure/machinery/keycard_auth, receive_request), src)
@@ -149,14 +149,14 @@
if(CONFIG_GET(flag/ert_admin_call_only)) return 1
return SSticker.mode && SSticker.mode.ert_disabled
-var/global/maint_all_access = 1
+GLOBAL_VAR_INIT(maint_all_access, TRUE)
/proc/make_maint_all_access()
- maint_all_access = 1
+ GLOB.maint_all_access = TRUE
ai_announcement("The maintenance access requirement has been removed on all airlocks.")
/proc/revoke_maint_all_access()
- maint_all_access = 0
+ GLOB.maint_all_access = FALSE
ai_announcement("The maintenance access requirement has been added on all airlocks.")
// Keycard reader at the CORSAT locks
@@ -209,7 +209,7 @@ var/global/maint_all_access = 1
/obj/structure/machinery/keycard_auth/lockdown/broadcast_request()
icon_state = "auth_on"
- for(var/obj/structure/machinery/keycard_auth/lockdown/KA in machines)
+ for(var/obj/structure/machinery/keycard_auth/lockdown/KA in GLOB.machines)
if(KA == src || KA.channel != channel)
continue
KA.reset()
@@ -249,7 +249,7 @@ var/global/maint_all_access = 1
/obj/structure/machinery/keycard_auth/lockdown/proc/timed_countdown(timeleft = 0)
if(!timeleft)
- for(var/obj/structure/machinery/door/poddoor/M in machines)
+ for(var/obj/structure/machinery/door/poddoor/M in GLOB.machines)
if(M.id == podlock_id && M.density)
INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/structure/machinery/door, open))
return
diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm
index 8221b8771c88..b6577a2fcbfa 100644
--- a/code/modules/security_levels/security_levels.dm
+++ b/code/modules/security_levels/security_levels.dm
@@ -1,51 +1,44 @@
-/var/security_level = 0
-//0 = code green
-//1 = code blue
-//2 = code red
-//3 = code delta
-
-//config.alert_desc_blue_downto
-
+GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN)
/proc/set_security_level(level, no_sound = FALSE, announce = TRUE, log = ARES_LOG_SECURITY)
- if(level != security_level)
+ if(level != GLOB.security_level)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_SECURITY_LEVEL_CHANGED, level)
//Will not be announced if you try to set to the same level as it already is
- if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != security_level)
+ if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != GLOB.security_level)
switch(level)
if(SEC_LEVEL_GREEN)
if(announce)
ai_announcement("Attention: Security level lowered to GREEN - all clear.", no_sound ? null : 'sound/AI/code_green.ogg', log)
- security_level = SEC_LEVEL_GREEN
+ GLOB.security_level = SEC_LEVEL_GREEN
if(SEC_LEVEL_BLUE)
- if(security_level < SEC_LEVEL_BLUE)
+ if(GLOB.security_level < SEC_LEVEL_BLUE)
if(announce)
ai_announcement("Attention: Security level elevated to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_elevated.ogg', log)
else
if(announce)
ai_announcement("Attention: Security level lowered to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_lowered.ogg', log)
- security_level = SEC_LEVEL_BLUE
+ GLOB.security_level = SEC_LEVEL_BLUE
if(SEC_LEVEL_RED)
- if(security_level < SEC_LEVEL_RED)
+ if(GLOB.security_level < SEC_LEVEL_RED)
if(announce)
ai_announcement("Attention: Security level elevated to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_elevated.ogg', log)
else
if(announce)
ai_announcement("Attention: Security level lowered to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_lowered.ogg', log)
- security_level = SEC_LEVEL_RED
+ GLOB.security_level = SEC_LEVEL_RED
if(SEC_LEVEL_DELTA)
if(announce)
var/name = "SELF-DESTRUCT SYSTEMS ACTIVE"
var/input = "DANGER, THE EMERGENCY DESTRUCT SYSTEM IS NOW ACTIVATED. PROCEED TO THE SELF-DESTRUCT CHAMBER FOR CONTROL ROD INSERTION."
marine_announcement(input, name, 'sound/AI/selfdestruct_short.ogg', logging = log)
- security_level = SEC_LEVEL_DELTA
+ GLOB.security_level = SEC_LEVEL_DELTA
/proc/get_security_level()
- switch(security_level)
+ switch(GLOB.security_level)
if(SEC_LEVEL_GREEN)
return "green"
if(SEC_LEVEL_BLUE)
diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm
index 4fe102270537..28d1a997f12a 100644
--- a/code/modules/shuttle/computers/dropship_computer.dm
+++ b/code/modules/shuttle/computers/dropship_computer.dm
@@ -217,9 +217,9 @@
dropship.control_doors("unlock", "all", TRUE)
dropship_control_lost = TRUE
door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), SHUTTLE_LOCK_COOLDOWN, TIMER_STOPPABLE)
- if(almayer_orbital_cannon)
- almayer_orbital_cannon.is_disabled = TRUE
- addtimer(CALLBACK(almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE)
+ if(GLOB.almayer_orbital_cannon)
+ GLOB.almayer_orbital_cannon.is_disabled = TRUE
+ addtimer(CALLBACK(GLOB.almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE)
if(!GLOB.resin_lz_allowed)
set_lz_resin_allowed(TRUE)
@@ -251,7 +251,7 @@
// select crash location
var/turf/source_turf = get_turf(src)
var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttleId)
- var/result = tgui_input_list(user, "Where to 'land'?", "Dropship Hijack", almayer_ship_sections , timeout = 10 SECONDS)
+ var/result = tgui_input_list(user, "Where to 'land'?", "Dropship Hijack", GLOB.almayer_ship_sections , timeout = 10 SECONDS)
if(!result)
return
if(!user.Adjacent(source_turf) && !force)
diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm
index 36bc879ace46..809601c815f2 100644
--- a/code/modules/shuttle/dropship_hijack.dm
+++ b/code/modules/shuttle/dropship_hijack.dm
@@ -10,7 +10,7 @@
/datum/dropship_hijack/almayer/proc/crash_landing()
//break APCs
- for(var/obj/structure/machinery/power/apc/A in machines)
+ for(var/obj/structure/machinery/power/apc/A in GLOB.machines)
if(A.z != crash_site.z)
continue
if(prob(A.crash_break_probability))
@@ -66,7 +66,7 @@
var/explosion_alive = TRUE
while(explosion_alive)
explosion_alive = FALSE
- for(var/datum/automata_cell/explosion/E in cellauto_cells)
+ for(var/datum/automata_cell/explosion/E in GLOB.cellauto_cells)
if(E.explosion_cause_data && E.explosion_cause_data.cause_name == "dropship crash")
explosion_alive = TRUE
break
@@ -80,8 +80,8 @@
return FALSE
shuttle.callTime = DROPSHIP_CRASH_TRANSIT_DURATION * GLOB.ship_alt
SSshuttle.moveShuttle(shuttle.id, crash_site.id, TRUE)
- if(round_statistics)
- round_statistics.track_hijack()
+ if(GLOB.round_statistics)
+ GLOB.round_statistics.track_hijack()
return TRUE
/datum/dropship_hijack/almayer/proc/target_crash_site(ship_section)
@@ -115,8 +115,8 @@
return
// if the AA site matches target site
- if(target_ship_section == almayer_aa_cannon.protecting_section)
- var/list/remaining_crash_sites = almayer_ship_sections.Copy()
+ if(target_ship_section == GLOB.almayer_aa_cannon.protecting_section)
+ var/list/remaining_crash_sites = GLOB.almayer_ship_sections.Copy()
remaining_crash_sites -= target_ship_section
var/new_target_ship_section = pick(remaining_crash_sites)
var/turf/target = get_crashsite_turf(new_target_ship_section)
@@ -173,7 +173,7 @@
playsound_z(SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP)), 'sound/effects/dropship_crash.ogg', volume = 75)
/datum/dropship_hijack/almayer/proc/disable_latejoin()
- enter_allowed = FALSE
+ GLOB.enter_allowed = FALSE
/datum/dropship_hijack/almayer/proc/get_crashsite_turf(ship_section)
var/list/turfs = list()
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index d834822e884a..5fe3a7989898 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -184,11 +184,11 @@ All ShuttleMove procs go here
. = ..()
if(. & MOVE_AREA)
. |= MOVE_CONTENTS
- cameranet.removeCamera(src)
+ GLOB.cameranet.removeCamera(src)
/obj/structure/machinery/camera/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
- cameranet.addCamera(src)
+ GLOB.cameranet.addCamera(src)
/obj/structure/machinery/atmospherics/pipe/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
diff --git a/code/modules/shuttle/vehicle_elevator.dm b/code/modules/shuttle/vehicle_elevator.dm
index c9a051a261c5..d2e102933fd8 100644
--- a/code/modules/shuttle/vehicle_elevator.dm
+++ b/code/modules/shuttle/vehicle_elevator.dm
@@ -20,10 +20,10 @@
/obj/docking_port/mobile/vehicle_elevator/register()
. = ..()
SSshuttle.vehicle_elevator = src
- for(var/obj/structure/machinery/gear/G in machines)
+ for(var/obj/structure/machinery/gear/G in GLOB.machines)
if(G.id == "vehicle_elevator_gears")
gears += G
- for(var/obj/structure/machinery/door/poddoor/railing/R in machines)
+ for(var/obj/structure/machinery/door/poddoor/railing/R in GLOB.machines)
if(R.id == "vehicle_elevator_railing")
railings += R
diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm
index 79988bbb8da3..12c206ca70fe 100644
--- a/code/modules/shuttles/marine_ferry.dm
+++ b/code/modules/shuttles/marine_ferry.dm
@@ -74,10 +74,10 @@
return //Kill it so as not to repeat
/datum/shuttle/ferry/marine/proc/load_datums()
- if(!(info_tag in s_info))
+ if(!(info_tag in GLOB.s_info))
message_admins(SPAN_WARNING("Error with shuttles: Shuttle tag does not exist. Code: MSD10.\n WARNING: DROPSHIP LAUNCH WILL PROBABLY FAIL"))
- var/list/L = s_info[info_tag]
+ var/list/L = GLOB.s_info[info_tag]
info_datums = L.Copy()
/datum/shuttle/ferry/marine/proc/set_automated_launch(bool_v)
@@ -343,17 +343,17 @@
var/target_section = crash_target_section
if(isnull(target_section))
- var/list/potential_crash_sections = almayer_ship_sections.Copy()
- potential_crash_sections -= almayer_aa_cannon.protecting_section
+ var/list/potential_crash_sections = GLOB.almayer_ship_sections.Copy()
+ potential_crash_sections -= GLOB.almayer_aa_cannon.protecting_section
target_section = pick(potential_crash_sections)
- var/turf/T_trg = pick(shuttle_controller.locs_crash[target_section])
+ var/turf/T_trg = pick(SSoldshuttle.shuttle_controller.locs_crash[target_section])
for(var/X in equipments)
var/obj/structure/dropship_equipment/E = X
if(istype(E, /obj/structure/dropship_equipment/adv_comp/docking))
var/list/crash_turfs = list()
- for(var/turf/TU in shuttle_controller.locs_crash[target_section])
+ for(var/turf/TU in SSoldshuttle.shuttle_controller.locs_crash[target_section])
if(istype(get_area(TU), /area/almayer/hallways/hangar))
crash_turfs += TU
if(crash_turfs.len) T_trg = pick(crash_turfs)
@@ -363,7 +363,7 @@
if(!istype(T_src) || !istype(T_int) || !istype(T_trg))
message_admins(SPAN_WARNING("Error with shuttles: Reference turfs not correctly instantiated. Code: MSD04.\n WARNING: DROPSHIP LAUNCH WILL FAIL"))
- shuttle_controller.locs_crash[target_section] -= T_trg
+ SSoldshuttle.shuttle_controller.locs_crash[target_section] -= T_trg
//END: Heavy lifting backend
@@ -440,12 +440,12 @@
sleep(85)
- if(security_level < SEC_LEVEL_RED) //automatically set security level to red.
+ if(GLOB.security_level < SEC_LEVEL_RED) //automatically set security level to red.
set_security_level(SEC_LEVEL_RED, TRUE)
shake_cameras(turfs_int) //shake for 1.5 seconds before crash, 0.5 after
- for(var/obj/structure/machinery/power/apc/A in machines) //break APCs
+ for(var/obj/structure/machinery/power/apc/A in GLOB.machines) //break APCs
if(A.z != T_trg.z) continue
if(prob(A.crash_break_probability))
A.overload_lighting()
@@ -477,7 +477,7 @@
var/explosion_alive = TRUE
while(explosion_alive)
explosion_alive = FALSE
- for(var/datum/automata_cell/explosion/E in cellauto_cells)
+ for(var/datum/automata_cell/explosion/E in GLOB.cellauto_cells)
if(E.explosion_cause_data && E.explosion_cause_data.cause_name == "dropship crash")
explosion_alive = TRUE
break
@@ -520,15 +520,15 @@
open_doors_crashed(turfs_trg) //And now open the doors
- for (var/obj/structure/machinery/door_display/research_cell/d in machines)
+ for (var/obj/structure/machinery/door_display/research_cell/d in GLOB.machines)
if(is_mainship_level(d.z) || is_reserved_level(d.z))
d.ion_act() //Breaking xenos out of containment
//Stolen from events.dm. WARNING: This code is old as hell
- for (var/obj/structure/machinery/power/apc/APC in machines)
+ for (var/obj/structure/machinery/power/apc/APC in GLOB.machines)
if(is_mainship_level(APC.z) || is_reserved_level(APC.z))
APC.ion_act()
- for (var/obj/structure/machinery/power/smes/SMES in machines)
+ for (var/obj/structure/machinery/power/smes/SMES in GLOB.machines)
if(is_mainship_level(SMES.z) || is_reserved_level(SMES.z))
SMES.ion_act()
@@ -545,7 +545,7 @@
colonial_marines.add_current_round_status_to_end_results("Hijack")
/datum/shuttle/ferry/marine/proc/disable_latejoin()
- enter_allowed = FALSE
+ GLOB.enter_allowed = FALSE
/datum/shuttle/ferry/marine/short_jump()
diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm
index dccdfad920f4..816447658f13 100644
--- a/code/modules/shuttles/shuttle_console.dm
+++ b/code/modules/shuttles/shuttle_console.dm
@@ -33,7 +33,7 @@ GLOBAL_LIST_EMPTY(shuttle_controls)
return ..()
/obj/structure/machinery/computer/shuttle_control/proc/get_shuttle()
- var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
+ var/datum/shuttle/ferry/shuttle = SSoldshuttle.shuttle_controller.shuttles[shuttle_tag]
if(shuttle_datum)
shuttle = shuttle_datum
@@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY(shuttle_controls)
"auto_time_cdown" = automated_launch_time_left,
)
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ ui = SSnano.nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, shuttle.iselevator? "elevator_control_console.tmpl" : "shuttle_control_console.tmpl", shuttle.iselevator? "Elevator Control" : "Shuttle Control", 550, 500)
@@ -262,7 +262,7 @@ GLOBAL_LIST_EMPTY(shuttle_controls)
return
// Allow the queen to choose the ship section to crash into
- var/crash_target = tgui_input_list(usr, "Choose a ship section to target","Hijack", almayer_ship_sections + list("Cancel"))
+ var/crash_target = tgui_input_list(usr, "Choose a ship section to target","Hijack", GLOB.almayer_ship_sections + list("Cancel"))
if(crash_target == "Cancel")
return
@@ -280,16 +280,16 @@ GLOBAL_LIST_EMPTY(shuttle_controls)
shuttle1.true_crash_target_section = crash_target
// If the AA is protecting the target area, pick any other section to crash into at random
- if(almayer_aa_cannon.protecting_section == crash_target)
- var/list/potential_crash_sections = almayer_ship_sections.Copy()
- potential_crash_sections -= almayer_aa_cannon.protecting_section
+ if(GLOB.almayer_aa_cannon.protecting_section == crash_target)
+ var/list/potential_crash_sections = GLOB.almayer_ship_sections.Copy()
+ potential_crash_sections -= GLOB.almayer_aa_cannon.protecting_section
crash_target = pick(potential_crash_sections)
shuttle1.crash_target_section = crash_target
shuttle1.transit_gun_mission = 0
- if(round_statistics)
- round_statistics.track_hijack()
+ if(GLOB.round_statistics)
+ GLOB.round_statistics.track_hijack()
marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY)
shuttle.alerts_allowed--
@@ -308,16 +308,16 @@ GLOBAL_LIST_EMPTY(shuttle_controls)
if(Q.hive)
addtimer(CALLBACK(Q.hive, TYPE_PROC_REF(/datum/hive_status, abandon_on_hijack)), DROPSHIP_WARMUP_TIME + 5 SECONDS, TIMER_UNIQUE) //+ 5 seconds catch standing in doorways
- if(bomb_set)
+ if(GLOB.bomb_set)
for(var/obj/structure/machinery/nuclearbomb/bomb in world)
bomb.end_round = FALSE
- if(almayer_orbital_cannon)
- almayer_orbital_cannon.is_disabled = TRUE
- addtimer(CALLBACK(almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE)
+ if(GLOB.almayer_orbital_cannon)
+ GLOB.almayer_orbital_cannon.is_disabled = TRUE
+ addtimer(CALLBACK(GLOB.almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE)
- if(almayer_aa_cannon)
- almayer_aa_cannon.is_disabled = TRUE
+ if(GLOB.almayer_aa_cannon)
+ GLOB.almayer_aa_cannon.is_disabled = TRUE
else
if(shuttle.require_link)
use_power(4080)
diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm
index 67da9ff4311e..7eb7b96eb2e8 100644
--- a/code/modules/shuttles/shuttle_supply.dm
+++ b/code/modules/shuttles/shuttle_supply.dm
@@ -77,7 +77,7 @@
lower_railings()
return
else //at centcom
- supply_controller.buy()
+ GLOB.supply_controller.buy()
//We pretend it's a long_jump by making the shuttle stay at centcom for the "in-transit" period.
var/area/away_area = get_location_area(away_location)
@@ -137,14 +137,14 @@
recharging = 0
/datum/shuttle/ferry/supply/proc/handle_sell()
- supply_controller.sell()
+ GLOB.supply_controller.sell()
// returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms
/datum/shuttle/ferry/supply/proc/forbidden_atoms_check()
if (!at_station())
return 0 //if badmins want to send mobs or a nuke on the supply shuttle from centcom we don't care
- return supply_controller.forbidden_atoms_check(get_location_area())
+ return GLOB.supply_controller.forbidden_atoms_check(get_location_area())
/datum/shuttle/ferry/supply/proc/at_station()
return (!location)
@@ -155,7 +155,7 @@
/datum/shuttle/ferry/supply/proc/raise_railings()
var/effective = 0
- for(var/obj/structure/machinery/door/poddoor/M in machines)
+ for(var/obj/structure/machinery/door/poddoor/M in GLOB.machines)
if(M.id == railing_id && !M.density)
effective = 1
spawn()
@@ -165,7 +165,7 @@
/datum/shuttle/ferry/supply/proc/lower_railings()
var/effective = 0
- for(var/obj/structure/machinery/door/poddoor/M in machines)
+ for(var/obj/structure/machinery/door/poddoor/M in GLOB.machines)
if(M.id == railing_id && M.density)
effective = 1
INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/structure/machinery/door, open))
@@ -173,14 +173,14 @@
playsound(locate(Elevator_x,Elevator_y,Elevator_z), 'sound/machines/elevator_openclose.ogg', 50, 0)
/datum/shuttle/ferry/supply/proc/start_gears(direction = 1)
- for(var/obj/structure/machinery/gear/M in machines)
+ for(var/obj/structure/machinery/gear/M in GLOB.machines)
if(M.id == gear_id)
spawn()
M.icon_state = "gear_moving"
M.setDir(direction)
/datum/shuttle/ferry/supply/proc/stop_gears()
- for(var/obj/structure/machinery/gear/M in machines)
+ for(var/obj/structure/machinery/gear/M in GLOB.machines)
if(M.id == gear_id)
spawn()
M.icon_state = "gear"
diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm
index 945e2e411767..8e4c9b5665ca 100644
--- a/code/modules/tgs/v4/api.dm
+++ b/code/modules/tgs/v4/api.dm
@@ -319,4 +319,4 @@
return channel
/datum/tgs_api/v4/SecurityLevel()
- return security_level
+ return GLOB.security_level
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 7226f29bba60..2e2f82e4eaae 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -253,7 +253,7 @@
/datum/tgs_api/v5/SecurityLevel()
RequireInitialBridgeResponse()
- return security_level
+ return GLOB.security_level
/datum/tgs_api/v5/Visibility()
RequireInitialBridgeResponse()
diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm
index c5bd55928362..f39780ff3426 100644
--- a/code/modules/vehicles/apc/apc_command.dm
+++ b/code/modules/vehicles/apc/apc_command.dm
@@ -184,9 +184,9 @@
//stole my own code from techpod_vendor
/obj/vehicle/multitile/apc/command/proc/get_access_permission(mob/living/carbon/human/user)
- if(SSticker.mode == GAMEMODE_WHISKEY_OUTPOST || master_mode == GAMEMODE_WHISKEY_OUTPOST)
+ if(SSticker.mode == GAMEMODE_WHISKEY_OUTPOST || GLOB.master_mode == GAMEMODE_WHISKEY_OUTPOST)
return TRUE
- else if(SSticker.mode == "Distress Signal" || master_mode == "Distress Signal")
+ else if(SSticker.mode == "Distress Signal" || GLOB.master_mode == "Distress Signal")
if(techpod_access_settings_override)
return TRUE
else if(user.get_target_lock(techpod_faction_requirement))
diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm
index ee49ebc0ab57..5963b0b4e36b 100644
--- a/code/modules/vehicles/hardpoints/hardpoint.dm
+++ b/code/modules/vehicles/hardpoints/hardpoint.dm
@@ -536,7 +536,7 @@
next_use = world.time + cooldown * owner.misc_multipliers["cooldown"]
if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- A = get_step(get_turf(A), pick(cardinal))
+ A = get_step(get_turf(A), pick(GLOB.cardinals))
if(LAZYLEN(activation_sounds))
playsound(get_turf(src), pick(activation_sounds), 60, 1)
diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
index 763bfb69842d..ad57e20e8456 100644
--- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
+++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
@@ -48,7 +48,7 @@
for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
var/atom/T = A
if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(cardinal))
+ T = get_step(get_turf(A), pick(GLOB.cardinals))
if(LAZYLEN(activation_sounds))
playsound(get_turf(src), pick(activation_sounds), 60, 1)
fire_projectile(user, T)
diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm
index c6158f1a3b2c..a6e44d2dbf2c 100644
--- a/code/modules/vehicles/hardpoints/primary/minigun.dm
+++ b/code/modules/vehicles/hardpoints/primary/minigun.dm
@@ -64,7 +64,7 @@
for(var/i = 1; i <= t; i++)
var/atom/T = A
if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(T), pick(cardinal))
+ T = get_step(get_turf(T), pick(GLOB.cardinals))
fire_projectile(user, T)
if(ammo.current_rounds <= 0)
break
diff --git a/code/modules/vehicles/hardpoints/secondary/cupola.dm b/code/modules/vehicles/hardpoints/secondary/cupola.dm
index f1f8f23435c2..3c329e135855 100644
--- a/code/modules/vehicles/hardpoints/secondary/cupola.dm
+++ b/code/modules/vehicles/hardpoints/secondary/cupola.dm
@@ -40,7 +40,7 @@
for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
var/atom/T = A
if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(cardinal))
+ T = get_step(get_turf(A), pick(GLOB.cardinals))
if(LAZYLEN(activation_sounds))
playsound(get_turf(src), pick(activation_sounds), 60, 1)
fire_projectile(user, T)
diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
index 4d454bed12a4..a4d7370935fe 100644
--- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
+++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
@@ -47,7 +47,7 @@
for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
var/atom/T = A
if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(cardinal))
+ T = get_step(get_turf(A), pick(GLOB.cardinals))
if(LAZYLEN(activation_sounds))
playsound(get_turf(src), pick(activation_sounds), 60, 1)
fire_projectile(user, T)
diff --git a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
index 9310556ee94f..b6f3daed9f4e 100644
--- a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
+++ b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
@@ -131,7 +131,7 @@
for(var/bullets_fired = 1, bullets_fired <= burst_amount, bullets_fired++)
var/atom/T = A
if(!prob((accuracy * 100) / owner.misc_multipliers["accuracy"]))
- T = get_step(get_turf(A), pick(cardinal))
+ T = get_step(get_turf(A), pick(GLOB.cardinals))
if(LAZYLEN(activation_sounds))
playsound(get_turf(src), pick(activation_sounds), 60, 1)
fire_projectile(user, T)
diff --git a/code/modules/vehicles/hardpoints/support/artillery.dm b/code/modules/vehicles/hardpoints/support/artillery.dm
index 441817107e7c..aacb83fcf383 100644
--- a/code/modules/vehicles/hardpoints/support/artillery.dm
+++ b/code/modules/vehicles/hardpoints/support/artillery.dm
@@ -57,7 +57,7 @@
continue
var/mob/user = C.seats[seat]
if(!user.client) continue
- user.client.change_view(world_view_size, owner)
+ user.client.change_view(GLOB.world_view_size, owner)
user.client.pixel_x = 0
user.client.pixel_y = 0
is_active = FALSE
diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm
index 3f3058d0572f..1e5df9fd1d81 100644
--- a/code/modules/vehicles/interior/interactable/seats.dm
+++ b/code/modules/vehicles/interior/interactable/seats.dm
@@ -43,7 +43,7 @@
vehicle.set_seated_mob(seat, null)
M.unset_interaction()
if(M.client)
- M.client.change_view(world_view_size, vehicle)
+ M.client.change_view(GLOB.world_view_size, vehicle)
M.client.pixel_x = 0
M.client.pixel_y = 0
M.reset_view()
@@ -177,7 +177,7 @@
vehicle.set_seated_mob(seat, null)
M.unset_interaction()
if(M.client)
- M.client.change_view(world_view_size, vehicle)
+ M.client.change_view(GLOB.world_view_size, vehicle)
M.client.pixel_x = 0
M.client.pixel_y = 0
else
@@ -255,7 +255,7 @@
vehicle.set_seated_mob(seat, null)
M.unset_interaction()
if(M.client)
- M.client.change_view(world_view_size, vehicle)
+ M.client.change_view(GLOB.world_view_size, vehicle)
M.client.pixel_x = 0
M.client.pixel_y = 0
M.reset_view()
diff --git a/code/modules/vehicles/multitile/multitile_bump.dm b/code/modules/vehicles/multitile/multitile_bump.dm
index d9b480866f99..6a7d312f5a06 100644
--- a/code/modules/vehicles/multitile/multitile_bump.dm
+++ b/code/modules/vehicles/multitile/multitile_bump.dm
@@ -642,7 +642,7 @@
//Check what dir they should be facing to be looking directly at the vehicle
else if(dir_between == dir) //front hit (facing the vehicle)
blocked = TRUE
- else if(dir_between == reverse_dir[dir]) // rear hit (facing directly away from the vehicle)
+ else if(dir_between == GLOB.reverse_dir[dir]) // rear hit (facing directly away from the vehicle)
takes_damage = TRUE
//side hit
else if(caste.caste_type == XENO_CASTE_QUEEN) // queen blocks even with sides
diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm
index ad69f80cdfb6..fb3665fd64a3 100644
--- a/code/modules/vehicles/tank/tank.dm
+++ b/code/modules/vehicles/tank/tank.dm
@@ -157,7 +157,7 @@
if(!T)
return FALSE
- if(direction == reverse_dir[T.dir] || direction == T.dir)
+ if(direction == GLOB.reverse_dir[T.dir] || direction == T.dir)
return FALSE
T.user_rotation(user, turning_angle(T.dir, direction))
diff --git a/code/names.dm b/code/names.dm
deleted file mode 100644
index 0961d12f7d45..000000000000
--- a/code/names.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-var/list/ai_names = file2list("strings/ai.txt")
-var/list/first_names_male = file2list("strings/first_male.txt")
-var/list/first_names_female = file2list("strings/first_female.txt")
-var/list/last_names = file2list("strings/last.txt")
-var/list/clown_names = file2list("strings/clown.txt")
-var/list/operation_titles = file2list("strings/operation_title.txt")
-var/list/operation_prefixes = file2list("strings/operation_prefix.txt")
-var/list/operation_postfixes = file2list("strings/operation_postfix.txt")
-
-var/list/verbs = file2list("strings/verbs.txt")
-//loaded on startup because of "
-//would include in rsc if ' was used
-
-
-var/list/first_names_male_clf = list("Alan","Jack","Bil","Jonathan","John","Shiro","Gareth","Clark","Sam", "Lionel", "Aaron", "Charlie", "Scott", "Winston", "Aidan", "Ellis", "Mason", "Wesley", "Nicholas", "Calvin", "Nishikawa", "Hiroto", "Chiba", "Ouchi", "Furuse", "Takagi", "Oba", "Kishimoto")
-var/list/first_names_female_clf = list("Emma", "Adelynn", "Mary", "Halie", "Chelsea", "Lexie", "Arya", "Alicia", "Selah", "Amber", "Heather", "Myra", "Heidi", "Charlotte", "Oliva", "Lydia", "Tia", "Riko", "Ari", "Machida", "Ueki", "Mihara", "Noda")
-var/list/last_names_clf = list("Hawkins","Rickshaw","Elliot","Billard","Cooper","Fox", "Barlow", "Barrows", "Stewart", "Morgan", "Green", "Stone", "Burr", "Hunt", "Yuko", "Gesshin", "Takanibu", "Tetsuzan", "Tomomi", "Bokkai", "Takesi")
-
-var/list/first_names_male_colonist = list("Alan","Jack","Bil","Jonathan","John","Shiro","Gareth","Clark","Sam", "Lionel", "Aaron", "Charlie", "Scott", "Winston", "Aidan", "Ellis", "Mason", "Wesley", "Nicholas", "Calvin", "Nishikawa", "Hiroto", "Chiba", "Ouchi", "Furuse", "Takagi", "Oba", "Kishimoto")
-var/list/first_names_female_colonist = list("Emma", "Adelynn", "Mary", "Halie", "Chelsea", "Lexie", "Arya", "Alicia", "Selah", "Amber", "Heather", "Myra", "Heidi", "Charlotte", "Ashley", "Raven", "Tori", "Anne", "Madison", "Oliva", "Lydia", "Tia", "Riko", "Ari", "Machida", "Ueki", "Mihara", "Noda")
-var/list/last_names_colonist = list("Hawkins","Rickshaw","Elliot","Billard","Cooper","Fox", "Barlow", "Barrows", "Stewart", "Morgan", "Green", "Stone", "Titan", "Crowe", "Krantz", "Pathillo", "Driggers", "Burr", "Hunt", "Yuko", "Gesshin", "Takanibu", "Tetsuzan", "Tomomi", "Bokkai", "Takesi")
-
-var/list/first_names_male_upp = list("Badai","Mongkeemur","Alexei","Andrei","Artyom","Viktor","Xiangai","Ivan","Choban","Oleg", "Dayan", "Taghi", "Batu", "Arik", "Orda", "Ghazan", "Bala", "Gao", "Zhan", "Ren", "Hou", "Xue", "Serafim", "Luca", "Su", "György", "István", "Mihály", "Vladimir", "Aleksandr", "Fyodor", "Bhodar", "Qazem", "Łukasz", "Miłogost", "Radogost", "Uniegost", "Hostirad", "Hostimil", "Hostisvit", "Lubgost", "Gościsław", "Vseslav", "Bohuměr", "Bronisław", "Česćiměr", "Dobysław", "Horisław", "Jaroměr", "Mirosław", "Mječisław", "Radoměr", "Stanij", "Stanisław", "Wjeleměr", "Wójsław")
-var/list/first_names_female_upp = list("Altani","Cirina","Anastasiya","Saran","Wei","Oksana","Ren","Svena","Tatyana","Yaroslava", "Izabella", "Kata", "Krisztina", "Miruna", "Flori", "Lucia", "Anica", "Li", "Yimu", "Alona", "Hsiau-Li", "Xiaoling", "Erhong", "Baśka", "Angela", "Angelina", "Angja", "Ankica", "Biljana", "Bisera", "Bistra", "Blaga", "Blagica", "Blagorodna", "Verka", "Vladica", "Denica", "Živka", "Zlata", "Jagoda", "Letka", "Ljupka", "Mila", "Mirjana", "Mirka", "Rada", "Radmila", "Slavica", "Slavka", "Snežana", "Stojna", "Ubavka", "Jaromir", "Mscëwòj", "Subisłôw", "Swiãtopôłk", "Ji-Sun", "Chaeyong", "Chaewon", "Saerom", "Seoyeong", "Jiheon", "Hayoung")
-var/list/last_names_upp = list("Azarov","Bogdanov","Barsukov","Golovin","Davydov","Khan","Noica","Barbu","Zhukov","Ivanov","Mihai","Kasputin","Belov", "Belova","Melnikov", "Vasilevsky", "Aleksander", "Halkovich", "Stanislaw", "Proca", "Zaituc", "Arcos", "Kubat", "Kral", "Volf", "Xun", "Jia", "Bachoń", "Wang", "Ji", "Xiang", "Zhang", "Mei", "Ma", "Kim", "Yi", "Ri", "Pak", "Chong", "Baek", "Kwon", "Hwang", "Roh", "Lee", "Song")
-
-var/list/first_names_male_pmc = list("Owen","Luka","Nelson","Branson", "Tyson", "Leo", "Bryant", "Kobe", "Rohan", "Riley", "Aidan", "Watase","Egawa", "Hisakawa", "Koide", "Remy", "Martial", "Magnus", "Heiko", "Lennard")
-var/list/first_names_female_pmc = list("Madison","Jessica","Anna","Juliet", "Olivia", "Lea", "Diane", "Kaori", "Beatrice", "Riley", "Amy", "Natsue","Yumi", "Aiko", "Fujiko", "Jennifer", "Ashley", "Mary", "Hitomi", "Lisa")
-var/list/last_names_pmc = list("Bates","Shaw","Hansen","Black", "Chambers", "Hall", "Gibson", "Weiss", "Waller", "Burton", "Bakin", "Rohan", "Naomichi", "Yakumo", "Yosai", "Gallagher", "Hiles", "Bourdon", "Strassman", "Palau")
-
-var/list/first_names_male_gladiator = list("Augustus", "Maximus", "Octavius", "Septimus", "Titus", "Brutus", "Caesar", "Justinian")
-var/list/first_names_female_gladiator = list("Aelia", "Aquila", "Caecilia", "Camilla", "Claudia", "Flavia", "Martina", "Theodora")
-
-var/list/first_names_male_dutch = list("Raymond", "Jesse", "Jack", "John", "Sam", "Aaron", "Charlie", "Ellis", "Nick", "Francis", "Louis")
-var/list/first_names_female_dutch = list("Chelsea", "Mira", "Jessica", "Catherine", "Eliza", "Emma", "Ashley", "Annie", "Alicia", "Miranda", "Ellen")
-
-var/list/monkey_names = list("Abu", "Aldo", "Bear", "Bingo", "Clyde", "Crystal", "Gordo", "George", "Koko", "Marcel", "Nim", "Rafiki", "Spike", "Banana", "Boots", "Bubbles", "Smiley", "Winston")
-
-var/list/weapon_surnames = list("Adze", "Axe", "Bagh Nakha", "Bo", "Bola", "Bow", "Bowman", "Cannon", "Carbine", "Cestus", "Club", "Culverin", "Dagger", "Dao", "Derringer", "Dha", "Dussack", "Emeici", "Falchion", "Fan", "Flyssa", "Gauntlet", "Hammer", "Halberd", "Harquebus", "Hatchet", "Hwando", "Katar", "Kampilan", "Knuckles", "Lance", "Lancer", "Larim", "Maduvu", "Mace", "Maru", "Mauser", "Messer", "Mine", "Mubucae", "Nyepel", "Onager", "Pata", "Pike", "Ram", "Saber", "Seax", "Shamsir", "Sickle", "Sling", "Spear", "Spears", "Staff", "Sword", "Tekko")
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 9ef2ad37c605..918ba1c70f67 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -17,7 +17,6 @@
#include "code\_experiments.dm"
#include "code\_macros.dm"
#include "code\global.dm"
-#include "code\names.dm"
#include "code\span_macros.dm"
#include "code\stylesheet.dm"
#include "code\__DEFINES\__game.dm"
@@ -180,10 +179,12 @@
#include "code\_globalvars\misc.dm"
#include "code\_globalvars\regexes.dm"
#include "code\_globalvars\tgui.dm"
+#include "code\_globalvars\lists\clans.dm"
#include "code\_globalvars\lists\client.dm"
#include "code\_globalvars\lists\keybindings.dm"
#include "code\_globalvars\lists\mapping_globals.dm"
#include "code\_globalvars\lists\mobs.dm"
+#include "code\_globalvars\lists\names.dm"
#include "code\_globalvars\lists\object_lists.dm"
#include "code\_onclick\adjacent.dm"
#include "code\_onclick\ai.dm"
@@ -1339,8 +1340,6 @@
#include "code\game\verbs\preferences.dm"
#include "code\game\verbs\records.dm"
#include "code\game\verbs\who.dm"
-#include "code\js\byjax.dm"
-#include "code\js\menus.dm"
#include "code\modules\trigger.dm"
#include "code\modules\admin\admin.dm"
#include "code\modules\admin\admin_ranks.dm"
diff --git a/html/changelogs/archive/2020-10.yml b/html/changelogs/archive/2020-10.yml
index e7521221204c..2ba5b71935c4 100644
--- a/html/changelogs/archive/2020-10.yml
+++ b/html/changelogs/archive/2020-10.yml
@@ -147,7 +147,7 @@
- rscadd: remixed smartgun firing audio.
2020-10-14:
Vampmare:
- - tweak: Reworked the RoleAuthority and rolling of roles. Special roles are now
+ - tweak: Reworked the GLOB.RoleAuthority and rolling of roles. Special roles are now
rolled with everything else, this helps with balancing and some other backend
stuff. First a fake rolling of marines are done, to get a approx number of roundstart
marines. Then xeno pop is calculated based on that. Then roles are actually
@@ -380,7 +380,7 @@
Trap cooldown per hostile living mob hit.'
2020-10-25:
Jeser:
- - bugfix: Readded Debug RoleAuthority verb that was unintentionally deleted some
+ - bugfix: Readded Debug GLOB.RoleAuthority verb that was unintentionally deleted some
time ago.
Vampmare:
- tweak: Predator and survivor now rolls before marine rolls in case of equal priority.
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index 4a223fe3d3c5..e44fe503eae3 100644
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -147,12 +147,12 @@ if grep -P '^/[\w/]\S+\(.*(var/|, ?var/.*).*\)' $code_files; then
st=1
fi;
-#part "unmanaged global vars"
-#if grep -P '^/*var/' $code_files; then
-# echo
-# echo -e "${RED}ERROR: Unmanaged global var use detected in code, please use the helpers.${NC}"
-# st=1
-#fi;
+part "unmanaged global vars"
+if grep -P '^/*var/' $code_files; then
+ echo
+ echo -e "${RED}ERROR: Unmanaged global var use detected in code, please use the helpers.${NC}"
+ st=1
+fi;
part "map json naming"
From 10b16fe57899129896550b526aabcbc9b5aa1d87 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:18:10 +0000
Subject: [PATCH 02/17] last minute change fail + TESTING and UNIT_TEST define
fails
---
code/__HELPERS/sorts/TimSort.dm | 14 +++++++-------
code/modules/admin/admin_ranks.dm | 8 ++++----
code/modules/mob/living/silicon/decoy/decoy.dm | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/code/__HELPERS/sorts/TimSort.dm b/code/__HELPERS/sorts/TimSort.dm
index c75f91227a6b..96b913a00c98 100644
--- a/code/__HELPERS/sorts/TimSort.dm
+++ b/code/__HELPERS/sorts/TimSort.dm
@@ -8,14 +8,14 @@
if(toIndex <= 0)
toIndex += L.len + 1
- var/datum/sortInstance = GLOB.sortInstance
- if(!sortInstance)
- sortInstance = new()
+ var/datum/sortInstance/sort_instance = GLOB.sortInstance
+ if(!sort_instance)
+ sort_instance = new()
- sortInstance.L = L
- sortInstance.cmp = cmp
- sortInstance.associative = associative
+ sort_instance.L = L
+ sort_instance.cmp = cmp
+ sort_instance.associative = associative
- sortInstance.timSort(fromIndex, toIndex)
+ sort_i nstance.timSort(fromIndex, toIndex)
return L
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index a5780f33a375..5bb9692b0368 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -51,8 +51,8 @@ GLOBAL_LIST_EMPTY(admin_ranks) //list of all ranks with associated rights
#ifdef TESTING
var/msg = "Permission Sets Built:\n"
- for(var/rank in admin_ranks)
- msg += "\t[rank] - [admin_ranks[rank]]\n"
+ for(var/rank in GLOB.admin_ranks)
+ msg += "\t[rank] - [GLOB.admin_ranks[rank]]\n"
testing(msg)
#endif
@@ -78,9 +78,9 @@ GLOBAL_LIST_EMPTY(admin_ranks) //list of all ranks with associated rights
#ifdef TESTING
var/msg = "Admins Built:\n"
- for(var/ckey in admin_datums)
+ for(var/ckey in GLOB.admin_datums)
var/rank
- var/datum/admins/D = admin_datums[ckey]
+ var/datum/admins/D = GLOB.admin_datums[ckey]
if(D) rank = D.rank
msg += "\t[ckey] - [rank]\n"
testing(msg)
diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm
index a58f870b4a7d..5294631a70ec 100644
--- a/code/modules/mob/living/silicon/decoy/decoy.dm
+++ b/code/modules/mob/living/silicon/decoy/decoy.dm
@@ -27,7 +27,7 @@
/mob/living/silicon/decoy/ship_ai/Destroy()
QDEL_NULL(ai_headset)
#ifdef UNIT_TESTS
- ai_mob_list -= src // Or should we always remove them?
+ GLOB.ai_mob_list -= src // Or should we always remove them?
#endif
return ..()
From 6c55a673973fefc22c7b676e7e6ee1dc3a1a782a Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:20:22 +0000
Subject: [PATCH 03/17] huh :dizzy_face:
---
code/__HELPERS/sorts/TimSort.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/__HELPERS/sorts/TimSort.dm b/code/__HELPERS/sorts/TimSort.dm
index 96b913a00c98..ae83bd9b0682 100644
--- a/code/__HELPERS/sorts/TimSort.dm
+++ b/code/__HELPERS/sorts/TimSort.dm
@@ -16,6 +16,6 @@
sort_instance.cmp = cmp
sort_instance.associative = associative
- sort_i nstance.timSort(fromIndex, toIndex)
+ sort_instance.timSort(fromIndex, toIndex)
return L
From f53438c38d9e1d26b832b07c791ac8385ee52277 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:32:05 +0000
Subject: [PATCH 04/17] nano plz
---
code/controllers/subsystem/nanoui.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm
index cfd877884dc9..e7c8096739ba 100644
--- a/code/controllers/subsystem/nanoui.dm
+++ b/code/controllers/subsystem/nanoui.dm
@@ -1,6 +1,5 @@
SUBSYSTEM_DEF(nano)
name = "Nano UI"
- flags = SS_NO_INIT
wait = 2 SECONDS
priority = SS_PRIORITY_NANOUI
runlevels = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY
@@ -12,6 +11,8 @@ SUBSYSTEM_DEF(nano)
nanomanager = new()
+ return SS_INIT_SUCCESS
+
/datum/controller/subsystem/nano/stat_entry(msg)
msg = "P:[nanomanager.processing_uis.len]"
return ..()
From 077ffcef82bb1ebd6249bafe58aff78493da5946 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:56:29 +0000
Subject: [PATCH 05/17] waaaa
---
code/controllers/subsystem/nanoui.dm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm
index e7c8096739ba..d89474dd50f1 100644
--- a/code/controllers/subsystem/nanoui.dm
+++ b/code/controllers/subsystem/nanoui.dm
@@ -6,13 +6,11 @@ SUBSYSTEM_DEF(nano)
var/list/currentrun = list()
var/datum/nanomanager/nanomanager
-/datum/controller/subsystem/nano/Initialize()
+/datum/controller/subsystem/nano/New()
. = ..()
nanomanager = new()
- return SS_INIT_SUCCESS
-
/datum/controller/subsystem/nano/stat_entry(msg)
msg = "P:[nanomanager.processing_uis.len]"
return ..()
From 4a6db12f37ae6aadf3b52af3d436efeefcdd64a5 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 21:49:33 +0000
Subject: [PATCH 06/17] missed tihs one
---
.../living/carbon/xenomorph/abilities/ravager/ravager_powers.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm
index feef78ae65e9..34e84866304b 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm
@@ -171,7 +171,7 @@
for (var/step in 0 to 3)
temp = get_step(turf, facing)
if(facing in GLOB.diagonals) // check if it goes through corners
- var/reverse_face = reverse_dir[facing]
+ var/reverse_face = GLOB.reverse_dir[facing]
var/turf/back_left = get_step(temp, turn(reverse_face, 45))
var/turf/back_right = get_step(temp, turn(reverse_face, -45))
From 85345712e771900f490a3b3fab2fccc019eb2d40 Mon Sep 17 00:00:00 2001
From: harryob
Date: Thu, 16 Nov 2023 22:38:42 +0000
Subject: [PATCH 07/17] Update code/__DEFINES/atmospherics.dm
Co-authored-by: fira
---
code/__DEFINES/atmospherics.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 6e0d4f527637..61f81d2833f2 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -38,7 +38,6 @@
#define GAS_TYPE_CO2 "carbon dioxyde"
/// This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage
-GLOBAL_VAR_INIT(MAX_EXPLOSION_RANGE, 14)
/// Used in /obj/structure/pipes/vents/proc/create_gas
#define VENT_GAS_SMOKE "Smoke"
From 048a9a896b4c40f5c7b41fd173d30e67d06eae2d Mon Sep 17 00:00:00 2001
From: harryob
Date: Thu, 16 Nov 2023 22:38:50 +0000
Subject: [PATCH 08/17] Update code/__HELPERS/cmp.dm
Co-authored-by: fira
---
code/__HELPERS/cmp.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index 95d88d8ff388..31308ac5812f 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -53,7 +53,6 @@ GLOBAL_LIST_INIT(cmp_field, "name")
if (!.)
. = B.qdels - A.qdels
-GLOBAL_DATUM(cmp_dist_origin, /atom)
/proc/cmp_typepaths_asc(A, B)
return sorttext("[B]","[A]")
From f77fe31e202a82e72be80e8d13060f0ea154656c Mon Sep 17 00:00:00 2001
From: harryob
Date: Thu, 16 Nov 2023 22:39:08 +0000
Subject: [PATCH 09/17] Update code/_globalvars/misc.dm
Co-authored-by: fira
---
code/_globalvars/misc.dm | 4 ----
1 file changed, 4 deletions(-)
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index 1bbc5f3f9d34..2a586e030020 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -33,10 +33,6 @@ GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
GLOBAL_LIST_INIT(reverse_dir, list(2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63))
-GLOBAL_LIST_EMPTY(combatlog)
-GLOBAL_LIST_EMPTY(IClog)
-GLOBAL_LIST_EMPTY(OOClog)
-GLOBAL_LIST_EMPTY(adminlog)
GLOBAL_DATUM_INIT(mods, /datum/moduletypes, new())
From 8f5701e9807a909826c8164a17f0a2f1514a3926 Mon Sep 17 00:00:00 2001
From: harryob
Date: Thu, 16 Nov 2023 22:39:16 +0000
Subject: [PATCH 10/17] Update
code/modules/mob/living/silicon/ai/freelook/read_me.dm
Co-authored-by: fira
---
code/modules/mob/living/silicon/ai/freelook/read_me.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/silicon/ai/freelook/read_me.dm b/code/modules/mob/living/silicon/ai/freelook/read_me.dm
index 5bfa5810a725..4d255772981e 100644
--- a/code/modules/mob/living/silicon/ai/freelook/read_me.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/read_me.dm
@@ -43,7 +43,7 @@ sight; for example, we don't update glass airlocks or floors.
WHERE IS EVERYTHING?
-GLOB.cameranet.dm = Everything about the cameranet datum.
+cameranet.dm = Everything about the cameranet datum.
chunk.dm = Everything about the chunk datum.
eye.dm = Everything about the AI and the AIEye.
updating.dm = Everything about triggers that will update chunks.
From 0c25de39b2f5197b02d341fa86dd88c63433a6b1 Mon Sep 17 00:00:00 2001
From: harryob
Date: Thu, 16 Nov 2023 22:39:24 +0000
Subject: [PATCH 11/17] Update code/controllers/mc/admin.dm
Co-authored-by: fira
---
code/controllers/mc/admin.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/controllers/mc/admin.dm b/code/controllers/mc/admin.dm
index c819482d33b5..8c5060864747 100644
--- a/code/controllers/mc/admin.dm
+++ b/code/controllers/mc/admin.dm
@@ -97,7 +97,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
set name = "Debug Role Authority"
if(!GLOB.RoleAuthority)
- to_chat(usr, "GLOB.RoleAuthority not found!")
+ to_chat(usr, "RoleAuthority not found!")
return
debug_variables(GLOB.RoleAuthority)
message_admins("Admin [key_name_admin(usr)] is debugging the Role Authority.")
From 33e6ef522008e7bf2e6ef12c18129ac5fbc2f52c Mon Sep 17 00:00:00 2001
From: harryob
Date: Thu, 16 Nov 2023 22:39:35 +0000
Subject: [PATCH 12/17] Update code/_globalvars/global_lists.dm
Co-authored-by: fira
---
code/_globalvars/global_lists.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
index 2abab0c5bea9..bac97d1994a3 100644
--- a/code/_globalvars/global_lists.dm
+++ b/code/_globalvars/global_lists.dm
@@ -133,7 +133,6 @@ GLOBAL_LIST_EMPTY(active_areas)
GLOBAL_LIST_EMPTY(all_areas)
GLOBAL_LIST_EMPTY(turfs)
-GLOBAL_LIST_EMPTY(z1turfs)
GLOBAL_LIST(objects_of_interest) // This is used to track the stealing objective for Agents.
From 58e32a6706b2d53a6ceaeacfa3db5ea783bd6799 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 22:44:55 +0000
Subject: [PATCH 13/17] firaview
---
code/__HELPERS/logging.dm | 2 +-
code/_globalvars/misc.dm | 4 --
code/controllers/subsystem/init/landmarks.dm | 4 +-
code/datums/modules.dm | 62 -------------------
.../game/machinery/computer/camera_console.dm | 2 +
code/game/machinery/hologram.dm | 16 +----
code/game/world.dm | 1 -
code/modules/admin/admin.dm | 2 -
code/modules/admin/topic/topic.dm | 27 --------
code/modules/cm_marines/shuttle_backend.dm | 5 --
.../living/carbon/xenomorph/attack_alien.dm | 2 +-
code/modules/shuttles/marine_ferry.dm | 7 ---
colonialmarines.dme | 1 -
13 files changed, 7 insertions(+), 128 deletions(-)
delete mode 100644 code/datums/modules.dm
diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm
index 721501a230bf..c20db3da303f 100644
--- a/code/__HELPERS/logging.dm
+++ b/code/__HELPERS/logging.dm
@@ -35,7 +35,7 @@
// will get logs that are one big line if the system is Linux and they are using notepad. This solves it by adding CR to every line ending
// in the logs. ascii character 13 = CR
-GLOBAL_LIST_INIT(log_end, world.system_type == UNIX ? ascii2text(13) : "")
+GLOBAL_VAR_INIT(log_end, world.system_type == UNIX ? ascii2text(13) : "")
/proc/error(msg)
world.log << "## ERROR: [msg][GLOB.log_end]"
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index 1bbc5f3f9d34..976c161a9145 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -1,8 +1,5 @@
GLOBAL_VAR_INIT(game_year, 2182)
-/// If this is anything but "secret", the secret rotation will forceably choose this mode.
-GLOBAL_VAR_INIT(secret_force_mode, "secret")
-
GLOBAL_VAR_INIT(ooc_allowed, TRUE)
GLOBAL_VAR_INIT(looc_allowed, TRUE)
GLOBAL_VAR_INIT(dsay_allowed, TRUE)
@@ -38,7 +35,6 @@ GLOBAL_LIST_EMPTY(IClog)
GLOBAL_LIST_EMPTY(OOClog)
GLOBAL_LIST_EMPTY(adminlog)
-GLOBAL_DATUM_INIT(mods, /datum/moduletypes, new())
GLOBAL_VAR(join_motd)
GLOBAL_VAR(current_tms)
diff --git a/code/controllers/subsystem/init/landmarks.dm b/code/controllers/subsystem/init/landmarks.dm
index 07654977e7e3..31b71c074a5d 100644
--- a/code/controllers/subsystem/init/landmarks.dm
+++ b/code/controllers/subsystem/init/landmarks.dm
@@ -48,8 +48,8 @@ SUBSYSTEM_DEF(landmark_init)
continue
if (pool.quota > pool.turfs.len)
- log_debug("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [GLOB.turfs.len] instances of [pool.type_to_spawn] instead. Code: ITEM_POOL_4")
- message_admins("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [GLOB.turfs.len] instances of [pool.type_to_spawn] instead. Tell the devs. Code: ITEM_POOL_4")
+ log_debug("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [pool.turfs.len] instances of [pool.type_to_spawn] instead. Code: ITEM_POOL_4")
+ message_admins("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [pool.turfs.len] instances of [pool.type_to_spawn] instead. Tell the devs. Code: ITEM_POOL_4")
pool.quota = pool.turfs.len
// Quota times, pick a random turf, spawn an item there, then remove that turf from the list.
diff --git a/code/datums/modules.dm b/code/datums/modules.dm
deleted file mode 100644
index c10448b1e186..000000000000
--- a/code/datums/modules.dm
+++ /dev/null
@@ -1,62 +0,0 @@
-// module datum.
-// this is per-object instance, and shows the condition of the modules in the object
-// actual modules needed is referenced through modulestypes and the object type
-
-/datum/module
- var/status // bits set if working, 0 if broken
- var/installed // bits set if installed, 0 if missing
-
-// moduletypes datum
-// this is per-object type, and shows the modules needed for a type of object
-
-/datum/moduletypes
- var/list/modcount = list() // assoc list of the count of modules for a type
-
-
-GLOBAL_LIST_INIT(modules, list( // global associative list
- /obj/structure/machinery/power/apc = "card_reader,power_control,id_auth,cell_power,cell_charge"))
-
-
-/datum/module/New(obj/O)
-
- var/type = O.type // the type of the creating object
-
- var/mneed = GLOB.mods.inmodlist(type) // find if this type has modules defined
-
- if(!mneed) // not found in module list?
- qdel(src) // delete self, thus ending proc
-
- var/needed = GLOB.mods.getbitmask(type) // get a bitmask for the number of modules in this object
- status = needed
- installed = needed
-
-/datum/moduletypes/proc/addmod(type, modtextlist)
- GLOB.modules += type // index by type text
- GLOB.modules[type] = modtextlist
-
-/datum/moduletypes/proc/inmodlist(type)
- return type in GLOB.modules
-
-/datum/moduletypes/proc/getbitmask(type)
- var/count = modcount[type]
- if(count)
- return 2**count-1
-
- var/modtext = GLOB.modules[type]
- var/num = 1
- var/pos = 1
-
- while(1)
- pos = findtext(modtext, ",", pos, 0)
- if(!pos)
- break
- else
- pos++
- num++
-
- modcount += type
- modcount[type] = num
-
- return 2**num-1
-
-
diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
index cad4fd4fc747..ca8c8b2f1a34 100644
--- a/code/game/machinery/computer/camera_console.dm
+++ b/code/game/machinery/computer/camera_console.dm
@@ -40,6 +40,8 @@
instance.del_on_map_removal = FALSE
if(instance.blend_mode_override)
instance.blend_mode = instance.blend_mode_override
+ if(istype(instance, /atom/movable/screen/plane_master/lighting))
+ instance.add_filter("awooga", 1, color_matrix_filter(color_matrix_from_string("#90ee90")))
instance.screen_loc = "[map_name]:CENTER"
cam_plane_masters += instance
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index b7c0e8a68607..9ce3cb89bf79 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -59,12 +59,6 @@ Possible to do for anyone motivated enough:
Itegrate EMP effect to disable the unit.
*/
-
-// HOLOPAD MODE
-// 0 = RANGE BASED
-// 1 = AREA BASED
-GLOBAL_VAR_INIT(HOLOPAD_MODE, 0)
-
/obj/structure/machinery/hologram/holopad
name = "\improper AI holopad"
desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely."
@@ -167,17 +161,9 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(hologram)//If there is a hologram.
if(master && !master.stat && master.client && master.eyeobj)//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
if(!(stat & NOPOWER))//If the machine has power.
- if((GLOB.HOLOPAD_MODE == 0 && (get_dist(master.eyeobj, src) <= holo_range)))
+ if(get_dist(master.eyeobj, src) <= holo_range)
return 1
- else if (GLOB.HOLOPAD_MODE == 1)
-
- var/area/holo_area = get_area(src)
- var/area/eye_area = get_area(master.eyeobj)
-
- if(eye_area == holo_area)
- return 1
-
clear_holo()//If not, we want to get rid of the hologram.
return 1
diff --git a/code/game/world.dm b/code/game/world.dm
index 93de8c3118a1..d8156547ef76 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -46,7 +46,6 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
LoadBans()
load_motd()
load_tm_message()
- loadShuttleInfoDatums()
populate_gear_list()
initialize_global_regex()
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 0d6995075c91..fe95affaffd2 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -138,8 +138,6 @@
var/dat = {"
Change Game Mode
"}
- if(GLOB.master_mode == "secret")
- dat += "(Force Secret Mode)
"
dat += {"
diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm
index 40c6d273b267..93cd66d586c4 100644
--- a/code/modules/admin/topic/topic.dm
+++ b/code/modules/admin/topic/topic.dm
@@ -565,20 +565,6 @@
dat += {"Now: [GLOB.master_mode]"}
show_browser(usr, dat, "Change Gamemode", "c_mode")
- else if(href_list["f_secret"])
- if(!check_rights(R_ADMIN)) return
-
- if(SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "secret")
- return alert(usr, "The game mode has to be secret!", null, null, null, null)
- var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"}
- for(var/mode in config.modes)
- dat += {"[config.mode_names[mode]]
"}
- dat += {"Random (default)
"}
- dat += {"Now: [GLOB.secret_force_mode]"}
- show_browser(usr, dat, "Change Secret Gamemode", "f_secret")
-
else if(href_list["c_mode2"])
if(!check_rights(R_ADMIN|R_SERVER)) return
@@ -588,19 +574,6 @@
Game() // updates the main game menu
SSticker.save_mode(GLOB.master_mode)
-
- else if(href_list["f_secret2"])
- if(!check_rights(R_ADMIN|R_SERVER)) return
-
- if(SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "secret")
- return alert(usr, "The game mode has to be secret!", null, null, null, null)
- GLOB.secret_force_mode = href_list["f_secret2"]
- message_admins("[key_name_admin(usr)] set the forced secret mode as [GLOB.secret_force_mode].")
- Game() // updates the main game menu
- .(href, list("f_secret"=1))
-
else if(href_list["monkeyone"])
if(!check_rights(R_SPAWN)) return
diff --git a/code/modules/cm_marines/shuttle_backend.dm b/code/modules/cm_marines/shuttle_backend.dm
index 1bd96289e434..142caa81eb8a 100644
--- a/code/modules/cm_marines/shuttle_backend.dm
+++ b/code/modules/cm_marines/shuttle_backend.dm
@@ -87,11 +87,6 @@ DOCUMENTATION ON HOW TO ADD A NEW SHUTTLE: Fourkhan, 6/7/19
*/
-GLOBAL_LIST(s_info)
-
-/proc/loadShuttleInfoDatums()
- GLOB.s_info = list()
- return 1
/proc/get_shuttle_turfs(turf/ref, list/L)
diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
index d61587a64170..ba8099cea404 100644
--- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
+++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -769,7 +769,7 @@
last_locked = world.time
if(GLOB.almayer_orbital_cannon)
GLOB.almayer_orbital_cannon.is_disabled = TRUE
- addtimer(CALLBACK(GLOB.almayer_orbital_cannon, .obj/structure/orbital_cannon/proc/enable), 10 MINUTES, TIMER_UNIQUE)
+ addtimer(CALLBACK(GLOB.almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE)
queen_locked = 1
/datum/shuttle/ferry/marine/proc/door_override(mob/living/carbon/xenomorph/M, shuttle_tag)
diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm
index 12c206ca70fe..c23d2d689ed6 100644
--- a/code/modules/shuttles/marine_ferry.dm
+++ b/code/modules/shuttles/marine_ferry.dm
@@ -73,13 +73,6 @@
control.visible_message(SPAN_WARNING(fail_flavortext))
return //Kill it so as not to repeat
-/datum/shuttle/ferry/marine/proc/load_datums()
- if(!(info_tag in GLOB.s_info))
- message_admins(SPAN_WARNING("Error with shuttles: Shuttle tag does not exist. Code: MSD10.\n WARNING: DROPSHIP LAUNCH WILL PROBABLY FAIL"))
-
- var/list/L = GLOB.s_info[info_tag]
- info_datums = L.Copy()
-
/datum/shuttle/ferry/marine/proc/set_automated_launch(bool_v)
automated_launch = bool_v
if(bool_v)
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 918ba1c70f67..6d079582773c 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -327,7 +327,6 @@
#include "code\datums\mind.dm"
#include "code\datums\mixed.dm"
#include "code\datums\mob_hud.dm"
-#include "code\datums\modules.dm"
#include "code\datums\movement_detector.dm"
#include "code\datums\mutable_appearance.dm"
#include "code\datums\quadtree.dm"
From c2cf4dd95a7a68bf5710536a6ea34966fb6f0e01 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 22:46:08 +0000
Subject: [PATCH 14/17] goodbye z1 turfs
---
code/game/turfs/turf.dm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 329d73176f91..22fe85bdde65 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -73,8 +73,7 @@
vis_contents.Cut()
GLOB.turfs += src
- if(is_ground_level(z))
- GLOB.z1turfs += src
+
assemble_baseturfs()
From 1b85258d8c1c7972f14c731eaa8e79609c64bb94 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Thu, 16 Nov 2023 22:46:45 +0000
Subject: [PATCH 15/17] unedits the cl (lol)
---
html/changelogs/archive/2020-10.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/html/changelogs/archive/2020-10.yml b/html/changelogs/archive/2020-10.yml
index 2ba5b71935c4..e7521221204c 100644
--- a/html/changelogs/archive/2020-10.yml
+++ b/html/changelogs/archive/2020-10.yml
@@ -147,7 +147,7 @@
- rscadd: remixed smartgun firing audio.
2020-10-14:
Vampmare:
- - tweak: Reworked the GLOB.RoleAuthority and rolling of roles. Special roles are now
+ - tweak: Reworked the RoleAuthority and rolling of roles. Special roles are now
rolled with everything else, this helps with balancing and some other backend
stuff. First a fake rolling of marines are done, to get a approx number of roundstart
marines. Then xeno pop is calculated based on that. Then roles are actually
@@ -380,7 +380,7 @@
Trap cooldown per hostile living mob hit.'
2020-10-25:
Jeser:
- - bugfix: Readded Debug GLOB.RoleAuthority verb that was unintentionally deleted some
+ - bugfix: Readded Debug RoleAuthority verb that was unintentionally deleted some
time ago.
Vampmare:
- tweak: Predator and survivor now rolls before marine rolls in case of equal priority.
From 0839f0d581cb8e95d3f490d66808f6104d8c5460 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Fri, 17 Nov 2023 08:38:00 +0000
Subject: [PATCH 16/17] removes dead comment
---
code/__DEFINES/atmospherics.dm | 2 --
1 file changed, 2 deletions(-)
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 61f81d2833f2..999a840b7fdd 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -37,8 +37,6 @@
#define GAS_TYPE_PHORON "phoron"
#define GAS_TYPE_CO2 "carbon dioxyde"
-/// This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage
-
/// Used in /obj/structure/pipes/vents/proc/create_gas
#define VENT_GAS_SMOKE "Smoke"
#define VENT_GAS_CN20 "CN20 Nerve Gas"
From cd7951a0bb604db9fa83c620c376885f1f7df34d Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Fri, 17 Nov 2023 23:12:13 +0000
Subject: [PATCH 17/17] resolves soft conflict with minimaps
---
code/controllers/subsystem/minimap.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index d28fe916291a..64f4b92a1edd 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -874,7 +874,7 @@ SUBSYSTEM_DEF(minimaps)
if(faction == FACTION_MARINE)
COOLDOWN_START(GLOB, uscm_canvas_cooldown, canvas_cooldown_time)
var/mob/living/carbon/human/human_leader = user
- for(var/datum/squad/current_squad in RoleAuthority.squads)
+ for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads)
current_squad.send_maptext("Tactical map update in progress...", "Tactical Map:")
human_leader.visible_message(SPAN_BOLDNOTICE("Tactical map update in progress..."))
playsound_client(human_leader.client, "sound/effects/sos-morse-code.ogg")
"
else
dat+="None"
@@ -448,14 +447,14 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
else if(href_list["submit_new_channel"])
//var/list/existing_channels = list() //OBSOLETE
var/list/existing_authors = list()
- for(var/datum/feed_channel/FC in news_network.network_channels)
+ for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
//existing_channels += FC.channel_name
if(FC.author == "\[REDACTED\]")
existing_authors += FC.backup_author
else
existing_authors +=FC.author
var/check = 0
- for(var/datum/feed_channel/FC in news_network.network_channels)
+ for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
if(FC.channel_name == src.channel_name)
check = 1
break
@@ -468,7 +467,7 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
newChannel.channel_name = src.channel_name
newChannel.author = src.scanned_user
newChannel.locked = c_locked
- news_network.network_channels += newChannel //Adding channel to the global network
+ GLOB.news_network.network_channels += newChannel //Adding channel to the global network
src.screen=5
src.updateUsrDialog()
//src.update_icon()
@@ -476,7 +475,7 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
else if(href_list["set_channel_receiving"])
//var/list/datum/feed_channel/available_channels = list()
var/list/available_channels = list()
- for(var/datum/feed_channel/F in news_network.network_channels)
+ for(var/datum/feed_channel/F in GLOB.news_network.network_channels)
if( (!F.locked || F.author == scanned_user) && !F.censored)
available_channels += F.channel_name
src.channel_name = strip_html(tgui_input_list(usr, "Choose receiving Feed Channel", "Network Channel Handler", available_channels ))
@@ -501,12 +500,12 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
newMsg.body = src.msg
if(photo)
newMsg.img = photo.img
- for(var/datum/feed_channel/FC in news_network.network_channels)
+ for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
if(FC.channel_name == src.channel_name)
FC.messages += newMsg //Adding message to the network's appropriate feed_channel
break
src.screen=4
- for(var/obj/structure/machinery/newscaster/NEWSCASTER in allCasters)
+ for(var/obj/structure/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
NEWSCASTER.newsAlert(src.channel_name)
src.updateUsrDialog()
@@ -540,12 +539,12 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
else if(href_list["menu_wanted"])
var/already_wanted = 0
- if(news_network.wanted_issue)
+ if(GLOB.news_network.wanted_issue)
already_wanted = 1
if(already_wanted)
- src.channel_name = news_network.wanted_issue.author
- src.msg = news_network.wanted_issue.body
+ src.channel_name = GLOB.news_network.wanted_issue.author
+ src.msg = GLOB.news_network.wanted_issue.body
src.screen = 14
src.updateUsrDialog()
@@ -575,32 +574,32 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
WANTED.backup_author = src.scanned_user //I know, a bit wacky
if(photo)
WANTED.img = photo.img
- news_network.wanted_issue = WANTED
- for(var/obj/structure/machinery/newscaster/NEWSCASTER in allCasters)
+ GLOB.news_network.wanted_issue = WANTED
+ for(var/obj/structure/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
NEWSCASTER.newsAlert()
NEWSCASTER.update_icon()
src.screen = 15
else
- if(news_network.wanted_issue.is_admin_message)
+ if(GLOB.news_network.wanted_issue.is_admin_message)
alert("The wanted issue has been distributed by a Weyland-Yutani higherup. You cannot edit it.","Ok")
return
- news_network.wanted_issue.author = src.channel_name
- news_network.wanted_issue.body = src.msg
- news_network.wanted_issue.backup_author = src.scanned_user
+ GLOB.news_network.wanted_issue.author = src.channel_name
+ GLOB.news_network.wanted_issue.body = src.msg
+ GLOB.news_network.wanted_issue.backup_author = src.scanned_user
if(photo)
- news_network.wanted_issue.img = photo.img
+ GLOB.news_network.wanted_issue.img = photo.img
src.screen = 19
src.updateUsrDialog()
else if(href_list["cancel_wanted"])
- if(news_network.wanted_issue.is_admin_message)
+ if(GLOB.news_network.wanted_issue.is_admin_message)
alert("The wanted issue has been distributed by a Weyland-Yutani higherup. You cannot take it down.","Ok")
return
var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel")
if(choice=="Confirm")
- news_network.wanted_issue = null
- for(var/obj/structure/machinery/newscaster/NEWSCASTER in allCasters)
+ GLOB.news_network.wanted_issue = null
+ for(var/obj/structure/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
NEWSCASTER.update_icon()
src.screen=17
src.updateUsrDialog()
@@ -915,10 +914,10 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
/obj/structure/machinery/newscaster/proc/print_paper()
var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper
- for(var/datum/feed_channel/FC in news_network.network_channels)
+ for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
NEWSPAPER.news_content += FC
- if(news_network.wanted_issue)
- NEWSPAPER.important_message = news_network.wanted_issue
+ if(GLOB.news_network.wanted_issue)
+ NEWSPAPER.important_message = GLOB.news_network.wanted_issue
NEWSPAPER.forceMove(get_turf(src))
src.paper_remaining--
return
@@ -930,7 +929,7 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
/obj/structure/machinery/newscaster/proc/newsAlert(channel) //This isn't Agouri's work, for it is ugly and vile.
var/turf/T = get_turf(src) //Who the fuck uses spawn(600) anyway, jesus christ
if(channel)
- for(var/mob/O in hearers(world_view_size-1, T))
+ for(var/mob/O in hearers(GLOB.world_view_size-1, T))
O.show_message(SPAN_NEWSCASTER("[src.name] beeps, \"Breaking news from [channel]!\""), SHOW_MESSAGE_AUDIBLE)
src.alert = 1
src.update_icon()
@@ -939,7 +938,7 @@ var/list/obj/structure/machinery/newscaster/allCasters = list() //Global list th
src.update_icon()
playsound(src.loc, 'sound/machines/twobeep.ogg', 25, 1)
else
- for(var/mob/O in hearers(world_view_size-1, T))
+ for(var/mob/O in hearers(GLOB.world_view_size-1, T))
O.show_message(SPAN_NEWSCASTER("[src.name] beeps, \"Attention! Wanted issue distributed!\""), SHOW_MESSAGE_AUDIBLE)
playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 25, 1)
return
diff --git a/code/game/machinery/nuclearbomb.dm b/code/game/machinery/nuclearbomb.dm
index 28ebbecc7552..306f9c8bbcbe 100644
--- a/code/game/machinery/nuclearbomb.dm
+++ b/code/game/machinery/nuclearbomb.dm
@@ -1,5 +1,4 @@
-var/bomb_set = FALSE
-
+GLOBAL_VAR_INIT(bomb_set, FALSE)
/obj/structure/machinery/nuclearbomb
name = "\improper Nuclear Fission Explosive"
desc = "Nuke the entire site from orbit, it's the only way to be sure. Too bad we don't have any orbital nukes."
@@ -59,7 +58,7 @@ var/bomb_set = FALSE
update_minimap_icon()
return PROCESS_KILL
- bomb_set = TRUE //So long as there is one nuke timing, it means one nuke is armed.
+ GLOB.bomb_set = TRUE //So long as there is one nuke timing, it means one nuke is armed.
timeleft = explosion_time - world.time
if(world.time >= explosion_time)
explode()
@@ -90,7 +89,7 @@ var/bomb_set = FALSE
return XENO_ATTACK_ACTION
/obj/structure/machinery/nuclearbomb/attackby(obj/item/O as obj, mob/user as mob)
- if(anchored && timing && bomb_set && HAS_TRAIT(O, TRAIT_TOOL_WIRECUTTERS))
+ if(anchored && timing && GLOB.bomb_set && HAS_TRAIT(O, TRAIT_TOOL_WIRECUTTERS))
user.visible_message(SPAN_INFO("[user] begins to defuse \the [src]."), SPAN_INFO("You begin to defuse \the [src]. This will take some time..."))
if(do_after(user, 150 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE))
disable()
@@ -111,7 +110,7 @@ var/bomb_set = FALSE
return
if(isqueen(user))
- if(timing && bomb_set)
+ if(timing && GLOB.bomb_set)
user.visible_message(SPAN_INFO("[user] begins to defuse \the [src]."), SPAN_INFO("You begin to defuse \the [src]. This will take some time..."))
if(do_after(user, 5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE))
disable()
@@ -196,14 +195,14 @@ var/bomb_set = FALSE
timing = !timing
if(timing)
if(!safety)
- bomb_set = TRUE
+ GLOB.bomb_set = TRUE
explosion_time = world.time + timeleft
update_minimap_icon()
start_processing()
announce_to_players()
message_admins("\The [src] has been activated by [key_name(ui.user, 1)] [ADMIN_JMP_USER(ui.user)]")
else
- bomb_set = FALSE
+ GLOB.bomb_set = FALSE
else
disable()
message_admins("\The [src] has been deactivated by [key_name(ui.user, 1)] [ADMIN_JMP_USER(ui.user)]")
@@ -232,7 +231,7 @@ var/bomb_set = FALSE
being_used = FALSE
if(safety)
timing = FALSE
- bomb_set = FALSE
+ GLOB.bomb_set = FALSE
. = TRUE
if("toggleCommandLockout")
@@ -378,7 +377,7 @@ var/bomb_set = FALSE
/obj/structure/machinery/nuclearbomb/proc/disable()
timing = FALSE
- bomb_set = FALSE
+ GLOB.bomb_set = FALSE
timeleft = initial(timeleft)
explosion_time = null
announce_to_players()
@@ -436,7 +435,7 @@ var/bomb_set = FALSE
if(timing != -1)
message_admins("\The [src] has been unexpectedly deleted at ([x],[y],[x]). [ADMIN_JMP(src)]")
log_game("\The [src] has been unexpectedly deleted at ([x],[y],[x]).")
- bomb_set = FALSE
+ GLOB.bomb_set = FALSE
SSminimaps.remove_marker(src)
return ..()
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index b21f73af76d6..33e6e9749e48 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -296,7 +296,7 @@ Buildable meters
/obj/item/pipe/Move()
. = ..()
if ((pipe_type in list (PIPE_SIMPLE_BENT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_BENT, PIPE_HE_BENT, PIPE_INSULATED_BENT)) \
- && (src.dir in cardinal))
+ && (src.dir in GLOB.cardinals))
setDir(src.dir|turn(src.dir, 90))
else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
if(dir==2)
diff --git a/code/game/machinery/scoreboard.dm b/code/game/machinery/scoreboard.dm
index 9b8d6402ca96..8740bed6dcfb 100644
--- a/code/game/machinery/scoreboard.dm
+++ b/code/game/machinery/scoreboard.dm
@@ -68,7 +68,7 @@
active = 1
icon_state = "launcheract"
- for(var/obj/structure/machinery/scoreboard/X in machines)
+ for(var/obj/structure/machinery/scoreboard/X in GLOB.machines)
if(X.id == id)
X.reset_scores()
diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index e07b13f64f97..0b4574cc9fb4 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -14,10 +14,10 @@
var/datum/seed/new_seed_type
if(istype(O, /obj/item/grown))
var/obj/item/grown/F = O
- new_seed_type = seed_types[F.plantname]
+ new_seed_type = GLOB.seed_types[F.plantname]
else
var/obj/item/reagent_container/food/snacks/grown/F = O
- new_seed_type = seed_types[F.plantname]
+ new_seed_type = GLOB.seed_types[F.plantname]
if(new_seed_type)
to_chat(user, SPAN_NOTICE("You extract some seeds from [O]."))
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 79ead6321502..547dbba68e4f 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -146,7 +146,7 @@
maptext = new_text
/obj/structure/machinery/status_display/proc/get_supply_shuttle_timer()
- var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
+ var/datum/shuttle/ferry/supply/shuttle = GLOB.supply_controller.shuttle
if (!shuttle)
return "Error"
@@ -164,7 +164,7 @@
maptext = ""
/obj/structure/machinery/status_display/proc/set_sec_level_picture()
- switch(security_level)
+ switch(GLOB.security_level)
if(SEC_LEVEL_GREEN)
set_picture("default")
if(SEC_LEVEL_BLUE)
diff --git a/code/game/machinery/storm_siren.dm b/code/game/machinery/storm_siren.dm
index e78414cb7e5b..335115715488 100644
--- a/code/game/machinery/storm_siren.dm
+++ b/code/game/machinery/storm_siren.dm
@@ -11,11 +11,11 @@
health = 0
/obj/structure/machinery/storm_siren/Initialize()
- weather_notify_objects += src
+ GLOB.weather_notify_objects += src
return ..()
/obj/structure/machinery/storm_siren/Destroy()
- weather_notify_objects -= src
+ GLOB.weather_notify_objects -= src
. = ..()
/obj/structure/machinery/storm_siren/power_change()
diff --git a/code/game/machinery/supply_display.dm b/code/game/machinery/supply_display.dm
index 26117474f0fe..7317ed6435f2 100644
--- a/code/game/machinery/supply_display.dm
+++ b/code/game/machinery/supply_display.dm
@@ -6,7 +6,7 @@
message1 = "SUPPLY"
message2 = ""
- var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
+ var/datum/shuttle/ferry/supply/shuttle = GLOB.supply_controller.shuttle
if (!shuttle)
message2 = "Error"
else if(shuttle.has_arrive_time())
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index a370356ad60b..942d70f80705 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -128,7 +128,7 @@
dat += "