Unauthorized Access Removed. This console is currently under CMB investigation. Thank you for your cooperation.
"
return
temp += "KHZKNHZH#0-"
- if(!supply_controller.mendoza_status) // he's daed
+ if(!GLOB.supply_controller.mendoza_status) // he's daed
temp += "........."
return
handle_mendoza_dialogue() //mendoza has been in there for a while. he gets lonely sometimes
temp += "[last_viewed_group]
"
- for(var/supply_group_name in supply_controller.contraband_supply_groups)
+ for(var/supply_group_name in GLOB.supply_controller.contraband_supply_groups)
temp += "[supply_group_name] "
/obj/structure/machinery/computer/supplycomp/proc/handle_black_market_groups()
- temp = "W-Y Dollars: $[supply_controller.black_market_points] "
+ temp = "W-Y Dollars: $[GLOB.supply_controller.black_market_points] "
temp += "Back to black market categories
"
temp += "Purchase from: [last_viewed_group]
"
- for(var/supply_name in supply_controller.supply_packs )
- var/datum/supply_packs/supply_pack = supply_controller.supply_packs[supply_name]
+ for(var/supply_name in GLOB.supply_controller.supply_packs )
+ var/datum/supply_packs/supply_pack = GLOB.supply_controller.supply_packs[supply_name]
if(!is_buyable(supply_pack))
continue
temp += "[supply_name] Cost: $[round(supply_pack.dollar_cost)] "
@@ -1185,7 +1185,7 @@ var/datum/controller/supply/supply_controller = new()
return_value = movable_atom.black_market_value
// so they cant sell the same thing over and over and over
- return_value = POSITIVE(return_value - supply_controller.black_market_sold_items[movable_atom.type] * 0.5)
+ return_value = POSITIVE(return_value - GLOB.supply_controller.black_market_sold_items[movable_atom.type] * 0.5)
return return_value
/datum/controller/supply/proc/kill_mendoza()
@@ -1348,11 +1348,11 @@ var/datum/controller/supply/supply_controller = new()
new /datum/vehicle_order/apc/cmd(),
)
- if(!VehicleElevatorConsole)
- VehicleElevatorConsole = src
+ if(!GLOB.VehicleElevatorConsole)
+ GLOB.VehicleElevatorConsole = src
/obj/structure/machinery/computer/supplycomp/vehicle/Destroy()
- VehicleElevatorConsole = null
+ GLOB.VehicleElevatorConsole = null
return ..()
/obj/structure/machinery/computer/supplycomp/vehicle/attack_hand(mob/living/carbon/human/H as mob)
@@ -1408,8 +1408,8 @@ var/datum/controller/supply/supply_controller = new()
return
if(spent)
return
- if(!supply_controller)
- world.log << "## ERROR: Eek. The supply_controller controller datum is missing somehow."
+ if(!GLOB.supply_controller)
+ world.log << "## ERROR: Eek. The GLOB.supply_controller controller datum is missing somehow."
return
if (!SSshuttle.vehicle_elevator)
diff --git a/code/game/turfs/auto_turf.dm b/code/game/turfs/auto_turf.dm
index 45756c30bb9c..75501a1a7ecd 100644
--- a/code/game/turfs/auto_turf.dm
+++ b/code/game/turfs/auto_turf.dm
@@ -53,7 +53,7 @@
return
bleed_layer = max(0, new_layer)
- for(var/direction in alldirs)
+ for(var/direction in GLOB.alldirs)
var/turf/open/T = get_step(src, direction)
if(istype(T))
T.update_icon()
diff --git a/code/game/turfs/floor.dm b/code/game/turfs/floor.dm
index 5f99aba26c09..1be6235cd2ac 100644
--- a/code/game/turfs/floor.dm
+++ b/code/game/turfs/floor.dm
@@ -69,7 +69,7 @@
..()
if(is_grass_floor())
var/dir_sum = 0
- for(var/direction in cardinal)
+ for(var/direction in GLOB.cardinals)
var/turf/T = get_step(src,direction)
if(!(T.is_grass_floor()))
dir_sum += direction
diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm
index 4e47fd004f74..f957686fac22 100644
--- a/code/game/turfs/floor_types.dm
+++ b/code/game/turfs/floor_types.dm
@@ -203,6 +203,13 @@
icon_state = "default"
plating_type = /turf/open/floor/plating/almayer
+/// Admin level thunderdome floor. Doesn't get damaged by explosions and such for pristine testing
+/turf/open/floor/tdome
+ icon = 'icons/turf/almayer.dmi'
+ icon_state = "plating"
+ plating_type = /turf/open/floor/tdome
+ hull_floor = TRUE
+
//Cargo elevator
/turf/open/floor/almayer/empty
name = "empty space"
@@ -242,10 +249,10 @@
qdel(AM)
return
var/mob/living/carbon/human/thrown_human = AM
- for(var/atom/computer as anything in supply_controller.bound_supply_computer_list)
+ for(var/atom/computer as anything in GLOB.supply_controller.bound_supply_computer_list)
computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!")
- var/area/area_shuttle = supply_controller.shuttle?.get_location_area()
+ var/area/area_shuttle = GLOB.supply_controller.shuttle?.get_location_area()
if(!area_shuttle)
return
var/list/turflist = list()
@@ -452,7 +459,7 @@
/turf/open/floor/grass/LateInitialize()
. = ..()
- for(var/direction in cardinal)
+ for(var/direction in GLOB.cardinals)
if(istype(get_step(src,direction),/turf/open/floor))
var/turf/open/floor/FF = get_step(src,direction)
FF.update_icon() //so siding get updated properly
@@ -497,7 +504,7 @@
if(!broken && !burnt)
if(icon_state != "carpetsymbol")
var/connectdir = 0
- for(var/direction in cardinal)
+ for(var/direction in GLOB.cardinals)
if(istype(get_step(src, direction), /turf/open/floor))
var/turf/open/floor/FF = get_step(src, direction)
if(FF.is_carpet_floor())
@@ -538,7 +545,7 @@
icon_state = "carpet[connectdir]-[diagonalconnect]"
/turf/open/floor/carpet/make_plating()
- for(var/direction in alldirs)
+ for(var/direction in GLOB.alldirs)
if(istype(get_step(src, direction), /turf/open/floor))
var/turf/open/floor/FF = get_step(src,direction)
FF.update_icon() // So siding get updated properly
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index 93eb45c3b79c..72624aff99c8 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -24,7 +24,7 @@
add_cleanable_overlays()
var/list/turf/open/auto_turf/auto_turf_dirs = list()
- for(var/direction in alldirs)
+ for(var/direction in GLOB.alldirs)
var/turf/open/auto_turf/T = get_step(src, direction)
if(!istype(T))
continue
@@ -36,7 +36,7 @@
var/list/handled_dirs = list()
var/list/unhandled_dirs = list()
- for(var/direction in diagonals)
+ for(var/direction in GLOB.diagonals)
var/x_dir = direction & (direction-1)
var/y_dir = direction - x_dir
@@ -90,7 +90,7 @@
if(!T.icon_state_before_scorching)
T.icon_state_before_scorching = T.icon_state
var/direction_from_neighbor_towards_src = get_dir(T, src)
- var/icon/culling_mask = icon(T.icon, "[T.scorchable]_mask[turf_edgeinfo_cache[T.icon_state_before_scorching][dir2indexnum(T.dir)][dir2indexnum(direction_from_neighbor_towards_src)]]", direction_from_neighbor_towards_src)
+ var/icon/culling_mask = icon(T.icon, "[T.scorchable]_mask[GLOB.turf_edgeinfo_cache[T.icon_state_before_scorching][dir2indexnum(T.dir)][dir2indexnum(direction_from_neighbor_towards_src)]]", direction_from_neighbor_towards_src)
edge_overlay.Blend(culling_mask, ICON_OVERLAY)
edge_overlay.SwapColor(rgb(255, 0, 255, 255), rgb(0, 0, 0, 0))
overlays += edge_overlay
@@ -370,16 +370,16 @@
/turf/open/gm/grass/Initialize(mapload, ...)
. = ..()
- if(!locate(icon_state) in turf_edgeinfo_cache)
+ if(!locate(icon_state) in GLOB.turf_edgeinfo_cache)
switch(icon_state)
if("grass1")
- turf_edgeinfo_cache["grass1"] = GLOB.edgeinfo_full
+ GLOB.turf_edgeinfo_cache["grass1"] = GLOB.edgeinfo_full
if("grass2")
- turf_edgeinfo_cache["grass2"] = GLOB.edgeinfo_full
+ GLOB.turf_edgeinfo_cache["grass2"] = GLOB.edgeinfo_full
if("grassbeach")
- turf_edgeinfo_cache["grassbeach"] = GLOB.edgeinfo_edge
+ GLOB.turf_edgeinfo_cache["grassbeach"] = GLOB.edgeinfo_edge
if("gbcorner")
- turf_edgeinfo_cache["gbcorner"] = GLOB.edgeinfo_corner
+ GLOB.turf_edgeinfo_cache["gbcorner"] = GLOB.edgeinfo_corner
/turf/open/gm/dirt2
name = "dirt"
@@ -435,14 +435,14 @@
/turf/open/gm/dirtgrassborder/Initialize(mapload, ...)
. = ..()
- if(!locate(icon_state) in turf_edgeinfo_cache)
+ if(!locate(icon_state) in GLOB.turf_edgeinfo_cache)
switch(icon_state)
if("grassdirt_edge")
- turf_edgeinfo_cache["grassdirt_edge"] = GLOB.edgeinfo_edge
+ GLOB.turf_edgeinfo_cache["grassdirt_edge"] = GLOB.edgeinfo_edge
if("grassdirt_corner")
- turf_edgeinfo_cache["grassdirt_corner"] = GLOB.edgeinfo_corner
+ GLOB.turf_edgeinfo_cache["grassdirt_corner"] = GLOB.edgeinfo_corner
if("grassdirt_corner2")
- turf_edgeinfo_cache["grassdirt_corner2"] = GLOB.edgeinfo_corner2
+ GLOB.turf_edgeinfo_cache["grassdirt_corner2"] = GLOB.edgeinfo_corner2
/turf/open/gm/dirtgrassborder2
name = "grass"
diff --git a/code/game/turfs/snow.dm b/code/game/turfs/snow.dm
index 72b1f35d0aff..42cc9bd544c5 100644
--- a/code/game/turfs/snow.dm
+++ b/code/game/turfs/snow.dm
@@ -77,7 +77,7 @@
if(update_full)
var/turf/open/T
if(!skip_sides)
- for(var/dirn in alldirs)
+ for(var/dirn in GLOB.alldirs)
var/turf/open/snow/D = get_step(src,dirn)
if(istype(D))
//Update turfs that are near us, but only once
@@ -85,7 +85,7 @@
overlays.Cut()
- for(var/dirn in alldirs)
+ for(var/dirn in GLOB.alldirs)
T = get_step(src, dirn)
if(istype(T))
if(bleed_layer > T.bleed_layer && T.bleed_layer < 1)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 837610d5d7fe..22fe85bdde65 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -72,9 +72,8 @@
// by default, vis_contents is inherited from the turf that was here before
vis_contents.Cut()
- turfs += src
- if(is_ground_level(z))
- z1turfs += src
+ GLOB.turfs += src
+
assemble_baseturfs()
@@ -82,11 +81,11 @@
visibilityChanged()
- pass_flags = pass_flags_cache[type]
+ pass_flags = GLOB.pass_flags_cache[type]
if (isnull(pass_flags))
pass_flags = new()
initialize_pass_flags(pass_flags)
- pass_flags_cache[type] = pass_flags
+ GLOB.pass_flags_cache[type] = pass_flags
else
initialize_pass_flags()
diff --git a/code/game/turfs/walls/wall_icon.dm b/code/game/turfs/walls/wall_icon.dm
index 9e47612964c4..2b414ca46af8 100644
--- a/code/game/turfs/walls/wall_icon.dm
+++ b/code/game/turfs/walls/wall_icon.dm
@@ -86,7 +86,7 @@
break
if(success)
- if(get_dir(src, T) in cardinal)
+ if(get_dir(src, T) in GLOB.cardinals)
wall_dirs += get_dir(src, T)
for(var/neighbor in wall_dirs)
diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm
index f976da220b29..3093f8c7771a 100644
--- a/code/game/turfs/walls/wall_types.dm
+++ b/code/game/turfs/walls/wall_types.dm
@@ -263,15 +263,15 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
tag = "LOBBYART"
/proc/force_lobby_art(art_id)
- displayed_lobby_art = art_id
+ GLOB.displayed_lobby_art = art_id
var/turf/closed/wall/indestructible/splashscreen/SS = locate("LOBBYART")
var/list/lobby_arts = CONFIG_GET(str_list/lobby_art_images)
var/list/lobby_authors = CONFIG_GET(str_list/lobby_art_authors)
- SS.icon_state = lobby_arts[displayed_lobby_art]
- SS.desc = "Artwork by [lobby_authors[displayed_lobby_art]]"
+ SS.icon_state = lobby_arts[GLOB.displayed_lobby_art]
+ SS.desc = "Artwork by [lobby_authors[GLOB.displayed_lobby_art]]"
for(var/client/C in GLOB.clients)
- if(displayed_lobby_art != -1)
- var/author = lobby_authors[displayed_lobby_art]
+ if(GLOB.displayed_lobby_art != -1)
+ var/author = lobby_authors[GLOB.displayed_lobby_art]
if(author != "Unknown")
to_chat_forced(C, SPAN_ROUNDBODY("This round's lobby art is brought to you by [author]"))
@@ -822,7 +822,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
var/datum/movable_wall_group/MWG = new()
MWG.add_structure(current)
- for(var/dir in cardinal)
+ for(var/dir in GLOB.cardinals)
connected = locate() in get_step(current, dir)
if(connected in current_walls)
if(connected.group == src)
@@ -957,7 +957,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
/obj/structure/alien/movable_wall/proc/update_connections(propagate = FALSE)
var/list/wall_dirs = list()
- for(var/dir in alldirs)
+ for(var/dir in GLOB.alldirs)
var/obj/structure/alien/movable_wall/MW = locate() in get_step(src, dir)
if(!(MW in group.walls))
continue
@@ -1011,7 +1011,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
/obj/structure/alien/movable_wall/proc/recalculate_structure()
var/list/found_structures = list()
var/current_walls = 0
- for(var/i in cardinal)
+ for(var/i in GLOB.cardinals)
var/turf/T = get_step(src, i)
var/obj/structure/alien/movable_wall/MW = locate() in T
if(!MW)
@@ -1068,7 +1068,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
return COMPONENT_TURF_ALLOW_MOVEMENT
/obj/structure/alien/movable_wall/Move(NewLoc, direct)
- if(!(direct in cardinal))
+ if(!(direct in GLOB.cardinals))
return
group.try_move_in_direction(direct)
@@ -1242,7 +1242,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
. = ..()
if(.)
var/turf/T
- for(var/i in cardinal)
+ for(var/i in GLOB.cardinals)
T = get_step(src, i)
if(!istype(T)) continue
for(var/obj/structure/mineral_door/resin/R in T)
diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm
index 2387a2086192..437f203c5fbb 100644
--- a/code/game/turfs/walls/walls.dm
+++ b/code/game/turfs/walls/walls.dm
@@ -73,7 +73,7 @@
. = ..()
if(.) //successful turf change
var/turf/T
- for(var/i in cardinal)
+ for(var/i in GLOB.cardinals)
T = get_step(src, i)
//nearby glowshrooms updated
diff --git a/code/game/verbs/discord.dm b/code/game/verbs/discord.dm
index 210038084caa..2446c89aafe5 100644
--- a/code/game/verbs/discord.dm
+++ b/code/game/verbs/discord.dm
@@ -29,7 +29,7 @@
var/datum/entity/discord_identifier/new_identifier = DB_ENTITY(/datum/entity/discord_identifier)
var/not_unique = TRUE
- var/long_list = operation_postfixes + operation_prefixes + operation_titles
+ var/long_list = GLOB.operation_postfixes + GLOB.operation_prefixes + GLOB.operation_titles
var/token
while(not_unique)
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 3c964cf4011b..2fe22ef3d4da 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -15,10 +15,10 @@
return
if(!admin_holder || !(admin_holder.rights & R_MOD))
- if(!ooc_allowed) //Send to LOOC instead
+ if(!GLOB.ooc_allowed) //Send to LOOC instead
looc(msg)
return
- if(!dooc_allowed && (mob.stat == DEAD || isobserver(mob)))
+ if(!GLOB.dooc_allowed && (mob.stat == DEAD || isobserver(mob)))
to_chat(usr, SPAN_DANGER("OOC for dead mobs has been turned off."))
return
if(prefs.muted & MUTE_OOC)
@@ -108,10 +108,10 @@
return
if(!admin_holder || !(admin_holder.rights & R_MOD))
- if(!looc_allowed)
+ if(!GLOB.looc_allowed)
to_chat(src, SPAN_DANGER("LOOC is globally muted"))
return
- if(!dlooc_allowed && (mob.stat != CONSCIOUS || isobserver(mob)))
+ if(!GLOB.dlooc_allowed && (mob.stat != CONSCIOUS || isobserver(mob)))
to_chat(usr, SPAN_DANGER("Sorry, you cannot utilize LOOC while dead or incapacitated."))
return
if(prefs.muted & MUTE_OOC)
@@ -150,7 +150,7 @@
if(C.prefs.toggles_chat & CHAT_LOOC)
to_chat(C, "LOOC:[display_name]:[msg]")
- if(mob.looc_overhead || ooc_allowed)
+ if(mob.looc_overhead || GLOB.ooc_allowed)
var/transmit_language = isxeno(mob) ? LANGUAGE_XENOMORPH : LANGUAGE_ENGLISH
mob.langchat_speech(msg, heard, GLOB.all_languages[transmit_language], "#ff47d7")
diff --git a/code/game/verbs/records.dm b/code/game/verbs/records.dm
index 18ed35ee6321..db420a45bc76 100644
--- a/code/game/verbs/records.dm
+++ b/code/game/verbs/records.dm
@@ -84,7 +84,7 @@
var/list/options = list()
if(CLIENT_IS_STAFF(src))
- options = note_categories.Copy()
+ options = GLOB.note_categories.Copy()
if(admin_holder.rights & R_PERMISSIONS)
MA = TRUE
else if(!isCouncil(src))
@@ -97,13 +97,13 @@
return
target = ckey(target)
- if(RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_COMMANDER_COUNCIL)
+ if(GLOB.RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_COMMANDER_COUNCIL)
options |= "Commanding Officer"
edit_C = TRUE
- if(RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_SYNTHETIC_COUNCIL)
+ if(GLOB.RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_SYNTHETIC_COUNCIL)
options |= "Synthetic"
edit_S = TRUE
- if(RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_YAUTJA_COUNCIL)
+ if(GLOB.RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_YAUTJA_COUNCIL)
options |= "Yautja"
edit_Y = TRUE
@@ -116,17 +116,17 @@
if("Merit")
show_other_record(NOTE_MERIT, choice, target, TRUE)
if("Commanding Officer")
- if(MA || (RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_COMMANDER_LEADER))
+ if(MA || (GLOB.RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_COMMANDER_LEADER))
show_other_record(NOTE_COMMANDER, choice, target, TRUE, TRUE)
else
show_other_record(NOTE_COMMANDER, choice, target, edit_C)
if("Synthetic")
- if(MA || (RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_SYNTHETIC_LEADER))
+ if(MA || (GLOB.RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_SYNTHETIC_LEADER))
show_other_record(NOTE_SYNTHETIC, choice, target, TRUE, TRUE)
else
show_other_record(NOTE_SYNTHETIC, choice, target, edit_S)
if("Yautja")
- if(MA || (RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_YAUTJA_LEADER))
+ if(MA || (GLOB.RoleAuthority.roles_whitelist[src.ckey] & WHITELIST_YAUTJA_LEADER))
show_other_record(NOTE_YAUTJA, choice, target, TRUE, TRUE)
else
show_other_record(NOTE_YAUTJA, choice, target, edit_Y)
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 8a249d297cbe..45590c3fa006 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -83,7 +83,7 @@
counted_humanoids["Infected humans"]++
if(C.mob.faction == FACTION_MARINE)
counted_humanoids[FACTION_MARINE]++
- if(C.mob.job in (ROLES_MARINES))
+ if(C.mob.job in (GLOB.ROLES_MARINES))
counted_humanoids["USCM Marines"]++
else
counted_humanoids[C.mob.faction]++
@@ -160,7 +160,7 @@
if(CONFIG_GET(flag/show_manager))
LAZYSET(mappings, "Management", R_PERMISSIONS)
if(CONFIG_GET(flag/show_devs))
- LAZYSET(mappings, "Maintainers", R_PROFILER)
+ LAZYSET(mappings, "Maintainers", R_PROFILER)
LAZYSET(mappings, "Admins", R_ADMIN)
if(CONFIG_GET(flag/show_mods))
LAZYSET(mappings, "Moderators", R_MOD)
diff --git a/code/game/world.dm b/code/game/world.dm
index f5388ed6fd52..d8156547ef76 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,10 +1,8 @@
-var/world_view_size = 7
-var/lobby_view_size = 16
+GLOBAL_VAR_INIT(world_view_size, 7)
+GLOBAL_VAR_INIT(lobby_view_size, 16)
-var/internal_tick_usage = 0
-
-var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
+GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
/world
mob = /mob/new_player
turf = /turf/open/space/basic
@@ -18,7 +16,6 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
if (debug_server)
LIBCALL(debug_server, "auxtools_init")()
enable_debugging()
- internal_tick_usage = 0.2 * world.tick_lag
hub_password = "kMZy3U5jJHSiBQjr"
#ifdef BYOND_TRACY
@@ -49,8 +46,6 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
LoadBans()
load_motd()
load_tm_message()
- load_mode()
- loadShuttleInfoDatums()
populate_gear_list()
initialize_global_regex()
@@ -67,8 +62,8 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
// Only do offline sleeping when the server isn't running unit tests or hosting a local dev test
sleep_offline = (!running_tests && !testing_locally)
- if(!RoleAuthority)
- RoleAuthority = new /datum/authority/branch/role()
+ if(!GLOB.RoleAuthority)
+ GLOB.RoleAuthority = new /datum/authority/branch/role()
to_world(SPAN_DANGER("\b Job setup complete"))
initiate_minimap_icons()
@@ -99,7 +94,7 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
// If the server's configured for local testing, get everything set up ASAP.
// Shamelessly stolen from the test manager's host_tests() proc
if(testing_locally)
- master_mode = "Extended"
+ GLOB.master_mode = "Extended"
// Wait for the game ticker to initialize
while(!SSticker.initialized)
@@ -109,9 +104,6 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
SSticker.request_start()
return
-var/world_topic_spam_protect_ip = "0.0.0.0"
-var/world_topic_spam_protect_time = world.timeofday
-
/proc/start_logging()
GLOB.round_id = SSentity_manager.round.id
@@ -256,8 +248,8 @@ var/world_topic_spam_protect_time = world.timeofday
/world/proc/send_tgs_restart()
if(CONFIG_GET(string/new_round_alert_channel) && CONFIG_GET(string/new_round_alert_role_id))
- if(round_statistics)
- send2chat("[round_statistics.round_name][GLOB.round_id ? " (Round [GLOB.round_id])" : ""] completed!", CONFIG_GET(string/new_round_alert_channel))
+ if(GLOB.round_statistics)
+ send2chat("[GLOB.round_statistics.round_name][GLOB.round_id ? " (Round [GLOB.round_id])" : ""] completed!", CONFIG_GET(string/new_round_alert_channel))
if(SSmapping.next_map_configs)
var/datum/map_config/next_map = SSmapping.next_map_configs[GROUND_MAP]
if(next_map)
@@ -267,32 +259,20 @@ var/world_topic_spam_protect_time = world.timeofday
return
/world/proc/send_reboot_sound()
- var/reboot_sound = SAFEPICK(reboot_sfx)
+ var/reboot_sound = SAFEPICK(GLOB.reboot_sfx)
if(reboot_sound)
var/sound/reboot_sound_ref = sound(reboot_sound)
for(var/client/client as anything in GLOB.clients)
if(client?.prefs.toggles_sound & SOUND_REBOOT)
SEND_SOUND(client, reboot_sound_ref)
-/world/proc/load_mode()
- var/list/Lines = file2list("data/mode.txt")
- if(Lines.len)
- if(Lines[1])
- master_mode = Lines[1]
- log_misc("Saved mode is '[master_mode]'")
-
-/world/proc/save_mode(the_mode)
- var/F = file("data/mode.txt")
- fdel(F)
- F << the_mode
-
/world/proc/load_motd()
- join_motd = file2text("config/motd.txt")
+ GLOB.join_motd = file2text("config/motd.txt")
/world/proc/load_tm_message()
var/datum/getrev/revdata = GLOB.revdata
if(revdata.testmerge.len)
- current_tms = revdata.GetTestMergeInfo()
+ GLOB.current_tms = revdata.GetTestMergeInfo()
/world/proc/update_status()
//Note: Hub content is limited to 254 characters, including limited HTML/CSS.
@@ -310,32 +290,10 @@ var/world_topic_spam_protect_time = world.timeofday
world.status = s
-#define FAILED_DB_CONNECTION_CUTOFF 1
-var/failed_db_connections = 0
-var/failed_old_db_connections = 0
-
-// /hook/startup/proc/connectDB()
-// if(!setup_database_connection())
-// world.log << "Your server failed to establish a connection with the feedback database."
-// else
-// world.log << "Feedback database connection established."
-// return 1
-
-var/datum/BSQL_Connection/connection
-/proc/setup_database_connection()
-
- if(failed_db_connections > FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to conenct anymore.
- return 0
-
-
- return .
-
/proc/set_global_view(view_size)
- world_view_size = view_size
+ GLOB.world_view_size = view_size
for(var/client/c in GLOB.clients)
- c.view = world_view_size
-
-#undef FAILED_DB_CONNECTION_CUTOFF
+ c.view = GLOB.world_view_size
/proc/give_image_to_client(obj/O, icon_text)
var/image/I = image(null, O)
diff --git a/code/global.dm b/code/global.dm
index e329cbdd00d5..6847fbd2b7fe 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -38,135 +38,3 @@
#define AHOLD_IS_ADMIN(ahold) (ahold && (ahold.rights & R_ADMIN))
//items that ask to be called every cycle
-
-//////////////
-var/list/paper_tag_whitelist = list("center","p","div","span","h1","h2","h3","h4","h5","h6","hr","pre", \
- "big","small","font","i","u","b","s","sub","sup","tt","br","hr","ol","ul","li","caption","col", \
- "table","td","th","tr")
-
-///////////////
-
-var/command_name = "Central Command"
-var/station_name = "[MAIN_SHIP_NAME]"
-var/game_version = "Colonial Marines"
-var/game_year = 2182
-
-var/going = 1
-var/master_mode = "Distress Signal"
-
-/// If this is anything but "secret", the secret rotation will forceably choose this mode.
-var/secret_force_mode = "secret"
-
-var/host = null
-var/ooc_allowed = 1
-var/looc_allowed = 1
-var/dsay_allowed = 1
-var/dooc_allowed = 1
-var/dlooc_allowed = 0
-var/abandon_allowed = 1
-var/enter_allowed = 1
-var/shuttle_frozen = 0
-var/shuttle_left = 0
-var/midi_playing = 0
-var/heard_midi = 0
-var/total_silenced = 0
-
-var/list/admin_log = list()
-var/list/asset_log = list()
-
-var/CELLRATE = 0.006 // multiplier for watts per tick <> cell storage (eg: 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
- //It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided
-var/CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second)
-
-var/VehicleElevatorConsole
-var/VehicleGearConsole
-
-//Spawnpoints.
-var/list/fallen_list = list()
-/// This is for dogtags placed on crosses- they will show up at the end-round memorial.
-var/list/fallen_list_cross = list()
-var/list/cardinal = list(NORTH, SOUTH, EAST, WEST)
-var/list/diagonals = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
-var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
-var/list/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)
-
-var/list/combatlog = list()
-var/list/IClog = list()
-var/list/OOClog = list()
-var/list/adminlog = list()
-
-var/Debug = 0 // global debug switch
-
-var/datum/moduletypes/mods = new()
-
-var/join_motd = null
-var/current_tms
-
-// nanomanager, the manager for Nano UIs
-var/datum/nanomanager/nanomanager = new()
-
-var/list/BorgWireColorToFlag = RandomBorgWires()
-var/list/BorgIndexToFlag
-var/list/BorgIndexToWireColor
-var/list/BorgWireColorToIndex
-var/list/AAlarmWireColorToFlag = RandomAAlarmWires()
-var/list/AAlarmIndexToFlag
-var/list/AAlarmIndexToWireColor
-var/list/AAlarmWireColorToIndex
-
-//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
-#define MAX_MESSAGE_LEN 1024
-#define MAX_EMOTE_LEN 256
-#define MAX_PAPER_MESSAGE_LEN 3072
-#define MAX_BOOK_MESSAGE_LEN 9216
-#define MAX_NAME_LEN 26
-
-/// 3 minutes in the station.
-#define shuttle_time_in_station 3 MINUTES
-/// 10 minutes to arrive.
-#define shuttle_time_to_arrive 10 MINUTES
-
- // MySQL configuration
-
-var/sqladdress = "localhost"
-var/sqlport = "3306"
-var/sqldb = "cmdb"
-var/sqllogin = "root"
-var/sqlpass = ""
-
-
- // For FTP requests. (i.e. downloading runtime logs.)
- // However it'd be ok to use for accessing attack logs and such too, which are even laggier.
-var/fileaccess_timer = 0
-
-// Reference list for disposal sort junctions. Filled up by sorting junction's New()
-/var/list/tagger_locations = list()
-
-//added for Xenoarchaeology, might be useful for other stuff
-var/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
-var/list/alphabet_lowercase = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
-
-var/list/greek_letters = list("Alpha", "Beta", "Gamma", "Delta", "Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu", "Xi", "Omnicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi", "Chi", "Psi", "Omega")
-var/list/nato_phonetic_alphabet = list("Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliett", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-Ray", "Yankee", "Zulu")
-
-//Used for autocall procs on ERT
-var/distress_cancel = 0
-var/destroy_cancel = 0
-
-// Which lobby art is on display
-// This is updated by the lobby art turf when it initializes
-var/displayed_lobby_art = -1
-
-// Last global ID that was assigned to a mob (for round recording purposes)
-var/last_mob_gid = 0
-
-// be careful messing with this. the section names are hardcoded here, while defines are used everywhere else
-// see the big commented block for an explanation
-var/list/almayer_ship_sections = list(
- "Upper deck Foreship",
- "Upper deck Midship",
- "Upper deck Aftship",
- "Lower deck Foreship",
- "Lower deck Midship",
- "Lower deck Aftship"
-)
diff --git a/code/js/byjax.dm b/code/js/byjax.dm
deleted file mode 100644
index 8e196ef013f4..000000000000
--- a/code/js/byjax.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-//this function places received data into element with specified id.
-var/const/js_byjax = {"
-
-function replaceContent() {
- var args = Array.prototype.slice.call(arguments);
- var id = args\[0\];
- var content = args\[1\];
- var callback = null;
- if(args\[2\]){
- callback = args\[2\];
- if(args\[3\]){
- args = args.slice(3);
- }
- }
- var parent = document.getElementById(id);
- if(typeof(parent)!=='undefined' && parent!=null){
- parent.innerHTML = content?content:'';
- }
- if(callback && window\[callback\]){
- window\[callback\].apply(null,args);
- }
-}
-"}
-
-/*
-sends data to control_id:replaceContent
-
-receiver - mob
-control_id - window id (for windows opened with browse(), it'll be "windowname.browser")
-target_element - HTML element id
-new_content - HTML content
-callback - js function that will be called after the data is sent
-callback_args - arguments for callback function
-
-Be sure to include required js functions in your page, or it'll raise an exception.
-*/
-/proc/send_byjax(receiver, control_id, target_element, new_content=null, callback=null, list/callback_args=null)
- if(receiver && target_element && control_id) // && winexists(receiver, control_id))
- var/list/argums = list(target_element, new_content)
- if(callback)
- argums += callback
- if(callback_args)
- argums += callback_args
- argums = list2params(argums)
-/* if(callback_args)
- argums += "&[list2params(callback_args)]"
-*/
- receiver << output(argums,"[control_id]:replaceContent")
- return
-
diff --git a/code/js/menus.dm b/code/js/menus.dm
deleted file mode 100644
index 0064522c2f81..000000000000
--- a/code/js/menus.dm
+++ /dev/null
@@ -1,37 +0,0 @@
-var/const/js_dropdowns = {"
-function dropdowns() {
- var divs = document.getElementsByTagName('div');
- var headers = new Array();
- var links = new Array();
- for(var i=0;i=0) {
- elem.className = elem.className.replace('visible','hidden');
- this.className = this.className.replace('open','closed');
- this.innerHTML = this.innerHTML.replace('-','+');
- }
- else {
- elem.className = elem.className.replace('hidden','visible');
- this.className = this.className.replace('closed','open');
- this.innerHTML = this.innerHTML.replace('+','-');
- }
- return false;
- }
- })(links\[i\]);
- }
- }
-}
-"}
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index bf6d8e261ab3..94f40629fc6a 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -18,7 +18,7 @@
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
WAIT_DB_READY
- if(admin_datums[ckey] && (admin_datums[ckey].rights & R_MOD))
+ if(GLOB.admin_datums[ckey] && (GLOB.admin_datums[ckey].rights & R_MOD))
return ..()
if(CONFIG_GET(number/limit_players) && CONFIG_GET(number/limit_players) < GLOB.clients.len)
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index b64b1e4682fd..7dca354129ff 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -1,75 +1,75 @@
-var/CMinutes = null
-var/savefile/Banlist
+GLOBAL_VAR(CMinutes)
+GLOBAL_DATUM(Banlist, /savefile)
/proc/CheckBan(ckey, id, address)
- if(!Banlist) // if Banlist cannot be located for some reason
+ if(!GLOB.Banlist) // if GLOB.Banlist cannot be located for some reason
LoadBans() // try to load the bans
- if(!Banlist) // uh oh, can't find bans!
+ if(!GLOB.Banlist) // uh oh, can't find bans!
return 0 // ABORT ABORT ABORT
. = list()
var/appeal
if(CONFIG_GET(string/banappeals))
appeal = "\nFor more information on your ban, or to appeal, head to [CONFIG_GET(string/banappeals)]"
- Banlist.cd = "/base"
- if( "[ckey][id]" in Banlist.dir )
- Banlist.cd = "[ckey][id]"
- if (Banlist["temp"])
- if (!GetExp(Banlist["minutes"]))
+ GLOB.Banlist.cd = "/base"
+ if( "[ckey][id]" in GLOB.Banlist.dir )
+ GLOB.Banlist.cd = "[ckey][id]"
+ if (GLOB.Banlist["temp"])
+ if (!GetExp(GLOB.Banlist["minutes"]))
ClearTempbans()
return 0
else
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [GLOB.Banlist["reason"]]\nExpires: [GetExp(GLOB.Banlist["minutes"])]\nBy: [GLOB.Banlist["bannedby"]][appeal]"
else
- Banlist.cd = "/base/[ckey][id]"
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]"
+ GLOB.Banlist.cd = "/base/[ckey][id]"
+ .["desc"] = "\nReason: [GLOB.Banlist["reason"]]\nExpires: PERMENANT\nBy: [GLOB.Banlist["bannedby"]][appeal]"
.["reason"] = "ckey/id"
return .
else
- for (var/A in Banlist.dir)
- Banlist.cd = "/base/[A]"
+ for (var/A in GLOB.Banlist.dir)
+ GLOB.Banlist.cd = "/base/[A]"
var/matches
- if( ckey == Banlist["key"] )
+ if( ckey == GLOB.Banlist["key"] )
matches += "ckey"
- if( id == Banlist["id"] )
+ if( id == GLOB.Banlist["id"] )
if(matches)
matches += "/"
matches += "id"
- if( address == Banlist["ip"] )
+ if( address == GLOB.Banlist["ip"] )
if(matches)
matches += "/"
matches += "ip"
if(matches)
- if(Banlist["temp"])
- if (!GetExp(Banlist["minutes"]))
+ if(GLOB.Banlist["temp"])
+ if (!GetExp(GLOB.Banlist["minutes"]))
ClearTempbans()
return 0
else
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [GLOB.Banlist["reason"]]\nExpires: [GetExp(GLOB.Banlist["minutes"])]\nBy: [GLOB.Banlist["bannedby"]][appeal]"
else
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [GLOB.Banlist["reason"]]\nExpires: PERMENANT\nBy: [GLOB.Banlist["bannedby"]][appeal]"
.["reason"] = matches
return .
return 0
/proc/UpdateTime() //No idea why i made this a proc.
- CMinutes = (world.realtime / 10) / 60
+ GLOB.CMinutes = (world.realtime / 10) / 60
return 1
/proc/LoadBans()
- Banlist = new("data/banlist.bdb")
- log_admin("Loading Banlist")
+ GLOB.Banlist = new("data/banlist.bdb")
+ log_admin("Loading GLOB.Banlist")
- if (!length(Banlist.dir)) log_admin("Banlist is empty.")
+ if (!length(GLOB.Banlist.dir)) log_admin("GLOB.Banlist is empty.")
- if (!Banlist.dir.Find("base"))
- log_admin("Banlist missing base dir.")
- Banlist.dir.Add("base")
- Banlist.cd = "/base"
- else if (Banlist.dir.Find("base"))
- Banlist.cd = "/base"
+ if (!GLOB.Banlist.dir.Find("base"))
+ log_admin("GLOB.Banlist missing base dir.")
+ GLOB.Banlist.dir.Add("base")
+ GLOB.Banlist.cd = "/base"
+ else if (GLOB.Banlist.dir.Find("base"))
+ GLOB.Banlist.cd = "/base"
ClearTempbans()
return 1
@@ -77,64 +77,64 @@ var/savefile/Banlist
/proc/ClearTempbans()
UpdateTime()
- Banlist.cd = "/base"
- for (var/A in Banlist.dir)
- Banlist.cd = "/base/[A]"
- if (!Banlist["key"] || !Banlist["id"])
+ GLOB.Banlist.cd = "/base"
+ for (var/A in GLOB.Banlist.dir)
+ GLOB.Banlist.cd = "/base/[A]"
+ if (!GLOB.Banlist["key"] || !GLOB.Banlist["id"])
RemoveBan(A)
log_admin("Invalid Ban.")
message_admins("Invalid Ban.")
continue
- if (!Banlist["temp"]) continue
- if (CMinutes >= Banlist["minutes"]) RemoveBan(A)
+ if (!GLOB.Banlist["temp"]) continue
+ if (GLOB.CMinutes >= GLOB.Banlist["minutes"]) RemoveBan(A)
return 1
/proc/AddBan(ckey, computerid, reason, bannedby, temp, minutes, address)
- if(!Banlist) // if Banlist cannot be located for some reason
+ if(!GLOB.Banlist) // if GLOB.Banlist cannot be located for some reason
LoadBans() // try to load the bans
- if(!Banlist) // uh oh, can't find bans!
+ if(!GLOB.Banlist) // uh oh, can't find bans!
return 0 // ABORT ABORT ABORT
var/bantimestamp
if (temp)
UpdateTime()
- bantimestamp = CMinutes + minutes
+ bantimestamp = GLOB.CMinutes + minutes
- Banlist.cd = "/base"
- if ( Banlist.dir.Find("[ckey][computerid]"))
+ GLOB.Banlist.cd = "/base"
+ if ( GLOB.Banlist.dir.Find("[ckey][computerid]"))
RemoveBan("[ckey][computerid]") //have to remove dirs before processing
- Banlist.dir.Add("[ckey][computerid]")
- Banlist.cd = "/base/[ckey][computerid]"
- Banlist["key"] << ckey
- Banlist["id"] << computerid
- Banlist["ip"] << address
- Banlist["reason"] << reason
- Banlist["bannedby"] << bannedby
- Banlist["temp"] << temp
+ GLOB.Banlist.dir.Add("[ckey][computerid]")
+ GLOB.Banlist.cd = "/base/[ckey][computerid]"
+ GLOB.Banlist["key"] << ckey
+ GLOB.Banlist["id"] << computerid
+ GLOB.Banlist["ip"] << address
+ GLOB.Banlist["reason"] << reason
+ GLOB.Banlist["bannedby"] << bannedby
+ GLOB.Banlist["temp"] << temp
if (temp)
- Banlist["minutes"] << bantimestamp
+ GLOB.Banlist["minutes"] << bantimestamp
return 1
/proc/RemoveBan(foldername)
- if(!Banlist) // if Banlist cannot be located for some reason
+ if(!GLOB.Banlist) // if GLOB.Banlist cannot be located for some reason
LoadBans() // try to load the bans
- if(!Banlist) // uh oh, can't find bans!
+ if(!GLOB.Banlist) // uh oh, can't find bans!
return 0 // ABORT ABORT ABORT
var/key
var/id
- Banlist.cd = "/base/[foldername]"
- Banlist["key"] >> key
- Banlist["id"] >> id
- Banlist.cd = "/base"
+ GLOB.Banlist.cd = "/base/[foldername]"
+ GLOB.Banlist["key"] >> key
+ GLOB.Banlist["id"] >> id
+ GLOB.Banlist.cd = "/base"
- if (!Banlist.dir.Remove(foldername)) return 0
+ if (!GLOB.Banlist.dir.Remove(foldername)) return 0
if(!usr)
log_admin("Ban Expired: [key]")
@@ -143,18 +143,18 @@ var/savefile/Banlist
ban_unban_log_save("[key_name_admin(usr)] unbanned [key]")
log_admin("[key_name_admin(usr)] unbanned [key]")
message_admins("[key_name_admin(usr)] unbanned: [key]")
- for (var/A in Banlist.dir)
- Banlist.cd = "/base/[A]"
- if (key == Banlist["key"] /*|| id == Banlist["id"]*/)
- Banlist.cd = "/base"
- Banlist.dir.Remove(A)
+ for (var/A in GLOB.Banlist.dir)
+ GLOB.Banlist.cd = "/base/[A]"
+ if (key == GLOB.Banlist["key"] /*|| id == GLOB.Banlist["id"]*/)
+ GLOB.Banlist.cd = "/base"
+ GLOB.Banlist.dir.Remove(A)
continue
return 1
/proc/GetExp(minutes as num)
UpdateTime()
- var/exp = minutes - CMinutes
+ var/exp = minutes - GLOB.CMinutes
if (exp <= 0)
return 0
else
@@ -202,27 +202,27 @@ var/savefile/Banlist
var/a = pick(1,0)
var/b = pick(1,0)
if(b)
- Banlist.cd = "/base"
- Banlist.dir.Add("trash[i]trashid[i]")
- Banlist.cd = "/base/trash[i]trashid[i]"
- Banlist["key"] << "trash[i]"
+ GLOB.Banlist.cd = "/base"
+ GLOB.Banlist.dir.Add("trash[i]trashid[i]")
+ GLOB.Banlist.cd = "/base/trash[i]trashid[i]"
+ GLOB.Banlist["key"] << "trash[i]"
else
- Banlist.cd = "/base"
- Banlist.dir.Add("[last]trashid[i]")
- Banlist.cd = "/base/[last]trashid[i]"
- Banlist["key"] << last
- Banlist["id"] << "trashid[i]"
- Banlist["reason"] << "Trashban[i]."
- Banlist["temp"] << a
- Banlist["minutes"] << CMinutes + rand(1,2000)
- Banlist["bannedby"] << "trashmin"
+ GLOB.Banlist.cd = "/base"
+ GLOB.Banlist.dir.Add("[last]trashid[i]")
+ GLOB.Banlist.cd = "/base/[last]trashid[i]"
+ GLOB.Banlist["key"] << last
+ GLOB.Banlist["id"] << "trashid[i]"
+ GLOB.Banlist["reason"] << "Trashban[i]."
+ GLOB.Banlist["temp"] << a
+ GLOB.Banlist["minutes"] << GLOB.CMinutes + rand(1,2000)
+ GLOB.Banlist["bannedby"] << "trashmin"
last = "trash[i]"
- Banlist.cd = "/base"
+ GLOB.Banlist.cd = "/base"
/proc/ClearAllBans()
- Banlist.cd = "/base"
- for (var/A in Banlist.dir)
+ GLOB.Banlist.cd = "/base"
+ for (var/A in GLOB.Banlist.dir)
RemoveBan(A)
/client/proc/cmd_admin_do_ban(mob/M)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 38b63b94570c..fe95affaffd2 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -121,10 +121,10 @@
var/t //text to show in the window
var/u //unban button href arg
var/dat = "
"
- for(r in jobban_keylist)
- L = jobban_keylist[r]
+ for(r in GLOB.jobban_keylist)
+ L = GLOB.jobban_keylist[r]
for(c in L)
- i = jobban_keylist[r][c] //These are already strings, as you're iterating through them. Anyway, establish jobban.
+ i = GLOB.jobban_keylist[r][c] //These are already strings, as you're iterating through them. Anyway, establish jobban.
t = "[c] - [r] ## [i]"
u = "[c] - [r]"
dat += "
"
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..93cd66d586c4 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,23 +562,9 @@
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"])
- if(!check_rights(R_ADMIN)) return
-
- if(SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(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]"}
- 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(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].")
- Game() // updates the main game menu
- .(href, list("f_secret"=1))
-
else if(href_list["monkeyone"])
if(!check_rights(R_SPAWN)) return
@@ -949,7 +922,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 +1017,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 +1181,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 +1263,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 +1345,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 +1427,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 +1751,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 +1768,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 +1779,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 +1803,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 +1832,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 +1840,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 +1948,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 +1973,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 +1995,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..8a86d7282aa9 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -15,15 +15,21 @@
if(!src.mob)
return
+ var/list/area_turfs = get_area_turfs(A)
+
+ if(!length(area_turfs))
+ to_chat(src, "There aren't any turfs in this area!")
+ return
+
if(!isobserver(mob))
src.admin_ghost()
src.mob.on_mob_jump()
- src.mob.forceMove(pick(get_area_turfs(A)))
+ src.mob.forceMove(pick(area_turfs))
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/playsound.dm b/code/modules/admin/verbs/playsound.dm
index 9d622fce501b..0763a0e10795 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -1,45 +1,83 @@
-/client/proc/play_web_sound()
+/client/proc/play_admin_sound()
set category = "Admin.Fun"
- set name = "Play Internet Sound"
+ set name = "Play Admin Sound"
if(!check_rights(R_SOUNDS))
return
- var/ytdl = CONFIG_GET(string/invoke_youtubedl)
- if(!ytdl)
- to_chat(src, SPAN_BOLDWARNING("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value
+ var/sound_mode = tgui_input_list(src, "Play a sound from which source?", "Select Source", list("Web", "Upload"))
+ if(!sound_mode)
return
- var/web_sound_input = input("Enter content URL (supported sites only)", "Play Internet Sound via youtube-dl") as text|null
- if(!istext(web_sound_input) || !length(web_sound_input))
- return
+ var/list/data = list()
+ var/log_title = TRUE
+ var/web_sound_input
+ var/asset_name
+ var/must_send_assets = FALSE
+ var/announce_title = TRUE
+
+ if(sound_mode == "Web")
+ var/ytdl = CONFIG_GET(string/invoke_youtubedl)
+ if(!ytdl)
+ to_chat(src, SPAN_BOLDWARNING("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value
+ return
- web_sound_input = trim(web_sound_input)
+ web_sound_input = input("Enter content URL (supported sites only)", "Play Internet Sound via youtube-dl") as text|null
+ if(!istext(web_sound_input) || !length(web_sound_input))
+ return
- if(findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol))
- to_chat(src, SPAN_WARNING("Non-http(s) URIs are not allowed."))
- to_chat(src, SPAN_WARNING("For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website."))
- return
+ web_sound_input = trim(web_sound_input)
- var/web_sound_url = ""
- var/list/music_extra_data = list()
- var/title
+ if(findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol))
+ to_chat(src, SPAN_WARNING("Non-http(s) URIs are not allowed."))
+ to_chat(src, SPAN_WARNING("For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website."))
+ return
- var/list/output = world.shelleo("[ytdl] --geo-bypass --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_url_scrub(web_sound_input)]\"")
- var/errorlevel = output[SHELLEO_ERRORLEVEL]
- var/stdout = output[SHELLEO_STDOUT]
- var/stderr = output[SHELLEO_STDERR]
+ var/list/output = world.shelleo("[ytdl] --geo-bypass --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_url_scrub(web_sound_input)]\"")
+ var/errorlevel = output[SHELLEO_ERRORLEVEL]
+ var/stdout = output[SHELLEO_STDOUT]
+ var/stderr = output[SHELLEO_STDERR]
- if(errorlevel)
- to_chat(src, SPAN_WARNING("Youtube-dl URL retrieval FAILED: [stderr]"))
- return
+ if(errorlevel)
+ to_chat(src, SPAN_WARNING("Youtube-dl URL retrieval FAILED: [stderr]"))
+ return
- var/list/data = list()
- try
- data = json_decode(stdout)
- catch(var/exception/e)
- to_chat(src, SPAN_WARNING("Youtube-dl JSON parsing FAILED: [e]: [stdout]"))
- return
+ try
+ data = json_decode(stdout)
+ catch(var/exception/e)
+ to_chat(src, SPAN_WARNING("Youtube-dl JSON parsing FAILED: [e]: [stdout]"))
+ return
+
+ else if(sound_mode == "Upload")
+ var/current_transport = CONFIG_GET(string/asset_transport)
+ if(!current_transport || current_transport == "simple")
+ if(tgui_alert(usr, "WARNING: Your server is using simple asset transport. Sounds will have to be sent directly to players, which may freeze the game for long durations. Are you SURE?", "Really play direct sound?", list("Yes", "No")) != "Yes")
+ return
+ must_send_assets = TRUE
+
+ var/soundfile = input(usr, "Choose a sound file to play", "Upload Sound") as null|file
+ if(!soundfile)
+ return
+
+ var/static/regex/only_extension = regex(@{"^.*\.([a-z0-9]{1,5})$"}, "gi")
+ var/extension = only_extension.Replace("[soundfile]", "$1")
+ if(!length(extension))
+ to_chat(src, SPAN_WARNING("Invalid filename extension."))
+ return
+
+ var/static/playsound_notch = 1
+ asset_name = "admin_sound_[playsound_notch++].[extension]"
+ SSassets.transport.register_asset(asset_name, soundfile)
+ message_admins("[key_name_admin(src)] uploaded admin sound '[soundfile]' to asset transport.")
+
+ var/static/regex/remove_extension = regex(@{"\.[a-z0-9]+$"}, "gi")
+ data["title"] = remove_extension.Replace("[soundfile]", "")
+ data["url"] = SSassets.transport.get_asset_url(asset_name)
+ web_sound_input = "[soundfile]"
+ log_title = FALSE
+ var/title
+ var/web_sound_url = ""
+ var/list/music_extra_data = list()
if(data["url"])
music_extra_data["link"] = data["url"]
music_extra_data["title"] = data["title"]
@@ -48,19 +86,28 @@
music_extra_data["start"] = data["start_time"]
music_extra_data["end"] = data["end_time"]
- if(web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol))
+ if(!must_send_assets && web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol))
to_chat(src, SPAN_BOLDWARNING("BLOCKED: Content URL not using http(s) protocol"), confidential = TRUE)
to_chat(src, SPAN_WARNING("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol"), confidential = TRUE)
return
+ switch(tgui_alert(src, "Show the name of this sound to the players?", "Sound Name", list("Yes","No","Cancel")))
+ if("No")
+ music_extra_data["title"] = "Admin sound"
+ announce_title = FALSE
+ if("Cancel")
+ return
+
var/list/targets = list()
var/list/sound_type_list = list(
"Meme" = SOUND_ADMIN_MEME,
"Atmospheric" = SOUND_ADMIN_ATMOSPHERIC
)
- var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All Inview", "Single Inview"))
+
+ var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All In View Range", "Single Mob"))
var/sound_type = tgui_input_list(src, "What kind of sound is this?", "Select Sound Type", sound_type_list)
sound_type = sound_type_list[sound_type]
+
switch(style)
if("Globally")
targets = GLOB.mob_list
@@ -70,30 +117,40 @@
targets = GLOB.human_mob_list + GLOB.dead_mob_list
if("Ghosts")
targets = GLOB.observer_list + GLOB.dead_mob_list
- if("All Inview")
- targets = viewers(usr.client.view, src)
- if("Single Inview")
- var/mob/choice = tgui_input_list(src, "Select the mob to play to:","Select Mob", sortmobs())
+ if("All In View Range")
+ var/list/atom/ranged_atoms = urange(usr.client.view, get_turf(usr))
+ for(var/mob/receiver in ranged_atoms)
+ targets += receiver
+ if("Single Mob")
+ var/list/mob/all_mobs = sortmobs()
+ var/list/mob/all_client_mobs = list()
+ for(var/mob/mob in all_mobs)
+ if(mob.client)
+ all_client_mobs += mob
+ var/mob/choice = tgui_input_list(src, "Select the mob to play to:","Select Mob", all_client_mobs)
if(QDELETED(choice))
return
targets.Add(choice)
else
return
- for(var/i in targets)
- var/mob/M = i
- var/client/client = M?.client
- if((client?.prefs.toggles_sound & SOUND_INTERNET) && (client?.prefs.toggles_sound & sound_type))
+ for(var/mob/mob as anything in targets)
+ var/client/client = mob?.client
+ if((client?.prefs?.toggles_sound & SOUND_MIDI) && (client?.prefs?.toggles_sound & sound_type))
+ if(must_send_assets)
+ SSassets.transport.send_assets(client, asset_name)
client?.tgui_panel?.play_music(web_sound_url, music_extra_data)
+ if(announce_title)
+ to_chat(client, SPAN_BOLDANNOUNCE("An admin played: [music_extra_data["title"]]"), confidential = TRUE)
else
client?.tgui_panel?.stop_music()
- log_admin("[key_name(src)] played web sound: [web_sound_input] - [title] - [style]")
- message_admins("[key_name_admin(src)] played web sound: [web_sound_input] - [title] - [style]")
+ log_admin("[key_name(src)] played admin sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")
+ message_admins("[key_name_admin(src)] played admin sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")
-/client/proc/stop_web_sound()
+/client/proc/stop_admin_sound()
set category = "Admin.Fun"
- set name = "Stop Internet Sounds"
+ set name = "Stop Admin Sounds"
if(!check_rights(R_SOUNDS))
return
@@ -105,86 +162,3 @@
log_admin("[key_name(src)] stopped the currently playing web sounds.")
message_admins("[key_name_admin(src)] stopped the currently playing web sounds.")
-/client/proc/play_sound(S as sound)
- set category = "Admin.Fun"
- set name = "Play Midi Sound"
- if(!check_rights(R_SOUNDS))
- return
-
- var/freq = 1
- var/vol = tgui_input_number(src, "What volume would you like the sound to play at?", "Volume", 25, 100, 1)
- if(!vol)
- return
- vol = clamp(vol, 1, 100)
-
- var/sound/admin_sound = new()
- admin_sound.file = S
- admin_sound.priority = 250
- admin_sound.channel = SOUND_CHANNEL_ADMIN_MIDI
- admin_sound.frequency = freq
- admin_sound.wait = 1
- admin_sound.repeat = FALSE
- admin_sound.status = SOUND_STREAM
- admin_sound.volume = vol
-
- var/showtitle = FALSE
- var/res = alert(src, "Show the title of this song to the players?",, "Yes","No", "Cancel")
- switch(res)
- if("Yes")
- showtitle = TRUE
- if("Cancel")
- return
-
- var/list/targets = list()
- var/list/sound_type_list = list(
- "Meme" = SOUND_ADMIN_MEME,
- "Atmospheric" = SOUND_ADMIN_ATMOSPHERIC
- )
- var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All Inview", "Single Inview"))
- var/sound_type = tgui_input_list(src, "What kind of sound is this?", "Select Sound Type", sound_type_list)
- sound_type = sound_type_list[sound_type]
- switch(style)
- if("Globally")
- targets = GLOB.mob_list
- if("Xenos")
- targets = GLOB.xeno_mob_list + GLOB.dead_mob_list
- if("Marines")
- targets = GLOB.human_mob_list + GLOB.dead_mob_list
- if("Ghosts")
- targets = GLOB.observer_list + GLOB.dead_mob_list
- if("All Inview")
- targets = viewers(usr.client.view, src)
- if("Single Inview")
- var/mob/choice = tgui_input_list(src, "Select the mob to play to:","Select Mob", sortmobs())
- if(QDELETED(choice))
- return
- targets.Add(choice)
- else
- return
-
- for(var/items in targets)
- var/mob/Mob = items
- var/client/client = Mob?.client
- if((client?.prefs.toggles_sound & SOUND_INTERNET) && (client?.prefs.toggles_sound & sound_type))
- admin_sound.volume = vol * client?.admin_music_volume
- SEND_SOUND(Mob, admin_sound)
- admin_sound.volume = vol
- if(showtitle)
- to_chat(client, SPAN_BOLDANNOUNCE("An admin played: [S]"), confidential = TRUE)
-
- log_admin("[key_name(src)] played midi sound [S] - [style]")
- message_admins("[key_name_admin(src)] played midi sound [S] - [style]")
-
-/client/proc/stop_sound()
- set category = "Admin.Fun"
- set name = "Stop Midi Sounds"
-
- if(!check_rights(R_SOUNDS))
- return
-
- for(var/mob/M in GLOB.player_list)
- if(M.client)
- SEND_SOUND(M, sound(null))
-
- log_admin("[key_name(src)] stopped midi sounds.")
- message_admins("[key_name_admin(src)] stopped midi sounds.")
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 e72f4e7f9f52..74ce9a81eb88 100644
--- a/code/modules/almayer/machinery.dm
+++ b/code/modules/almayer/machinery.dm
@@ -205,7 +205,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
@@ -213,13 +213,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 fbb9e5d06ac1..cb9bb98d339d 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -286,7 +286,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 7811a6c9cb5a..e1dbd1f026c1 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -318,20 +318,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
@@ -351,7 +351,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)
@@ -405,10 +405,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\"")
@@ -442,7 +438,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)
@@ -534,17 +530,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..73493af538fa 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 += "
"
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..c567f7d684a2 100644
--- a/code/modules/projectiles/gun_attachables.dm
+++ b/code/modules/projectiles/gun_attachables.dm
@@ -495,6 +495,20 @@ Defined in conflicts.dm of the #defines folder.
accuracy_mod = HIT_ACCURACY_MULT_TIER_3
scatter_mod = -SCATTER_AMOUNT_TIER_8
+/obj/item/attachable/pmc_sniperbarrel
+ name = "sniper barrel"
+ icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi'
+ icon_state = "pmc_sniperbarrel"
+ desc = "A heavy barrel. CANNOT BE REMOVED."
+ slot = "muzzle"
+ flags_attach_features = NO_FLAGS
+ hud_offset_mod = -3
+
+/obj/item/attachable/pmc_sniperbarrel/New()
+ ..()
+ accuracy_mod = HIT_ACCURACY_MULT_TIER_3
+ scatter_mod = -SCATTER_AMOUNT_TIER_8
+
/obj/item/attachable/sniperbarrel/vulture
name = "\improper M707 barrel"
icon_state = "vulture_barrel"
@@ -1283,7 +1297,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 +1314,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 +1381,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 +1398,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/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm
index c18e45e38d3e..d21cb5b87254 100644
--- a/code/modules/projectiles/guns/boltaction.dm
+++ b/code/modules/projectiles/guns/boltaction.dm
@@ -214,7 +214,7 @@
return .
for(var/mob/current_mob as anything in get_mobs_in_z_level_range(get_turf(user), fire_message_range) - user)
- var/relative_dir = get_dir(current_mob, user)
+ var/relative_dir = Get_Compass_Dir(current_mob, user)
var/final_dir = dir2text(relative_dir)
to_chat(current_mob, SPAN_HIGHDANGER("You hear a massive boom coming from [final_dir ? "the [final_dir]" : "nearby"]!"))
if(current_mob.client)
diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
index 44fe816c0e6a..0e56efe7ab5d 100644
--- a/code/modules/projectiles/guns/flamer/flamer.dm
+++ b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -461,7 +461,8 @@ GLOBAL_LIST_EMPTY(flamer_particles)
tied_reagent = new R.type() // Can't get deleted this way
tied_reagent.make_alike(R)
- tied_reagents = obj_reagents
+ if(obj_reagents)
+ tied_reagents = obj_reagents
target_clicked = target
@@ -731,7 +732,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
@@ -777,7 +778,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/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm
index 17a2c0f26887..3fe2934259bf 100644
--- a/code/modules/projectiles/guns/specialist/sniper.dm
+++ b/code/modules/projectiles/guns/specialist/sniper.dm
@@ -154,7 +154,7 @@
target.overlays -= lockon_direction_icon
qdel(laser_beam)
- if(!check_can_use(target, TRUE))
+ if(!check_can_use(target, TRUE) || target.is_dead())
return
var/obj/projectile/aimed_proj = sniper_rifle.in_chamber
@@ -337,12 +337,12 @@
damage_mult = BASE_BULLET_DAMAGE_MULT
recoil = RECOIL_AMOUNT_TIER_5
-/obj/item/weapon/gun/rifle/sniper/xm43e1
+/obj/item/weapon/gun/rifle/sniper/XM43E1
name = "\improper XM43E1 experimental anti-materiel rifle"
desc = "An experimental anti-materiel rifle produced by Armat Systems, recently reacquired from the deep storage of an abandoned prototyping facility. This one in particular is currently undergoing field testing. Chambered in 10x99mm Caseless."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
- icon_state = "xm42b"
- item_state = "xm42b"
+ icon_state = "xm43e1"
+ item_state = "xm43e1"
unacidable = TRUE
indestructible = 1
@@ -353,12 +353,12 @@
zoomdevicename = "scope"
attachable_allowed = list(/obj/item/attachable/bipod)
flags_gun_features = GUN_AUTO_EJECTOR|GUN_SPECIALIST|GUN_WIELDED_FIRING_ONLY|GUN_AMMO_COUNTER
- starting_attachment_types = list(/obj/item/attachable/sniperbarrel)
+ starting_attachment_types = list(/obj/item/attachable/pmc_sniperbarrel)
sniper_beam_type = /obj/effect/ebeam/laser/intense
sniper_beam_icon = "laser_beam_intense"
sniper_lockon_icon = "sniper_lockon_intense"
-/obj/item/weapon/gun/rifle/sniper/XM42B/handle_starting_attachment()
+/obj/item/weapon/gun/rifle/sniper/XM43E1/handle_starting_attachment()
..()
var/obj/item/attachable/scope/variable_zoom/S = new(src)
S.icon_state = "pmcscope"
@@ -368,11 +368,11 @@
update_attachable(S.slot)
-/obj/item/weapon/gun/rifle/sniper/XM42B/set_gun_attachment_offsets()
+/obj/item/weapon/gun/rifle/sniper/XM43E1/set_gun_attachment_offsets()
attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 15, "rail_y" = 19, "under_x" = 20, "under_y" = 15, "stock_x" = 20, "stock_y" = 15)
-/obj/item/weapon/gun/rifle/sniper/XM42B/set_gun_config_values()
+/obj/item/weapon/gun/rifle/sniper/XM43E1/set_gun_config_values()
..()
set_fire_delay(FIRE_DELAY_TIER_6 * 6 )//Big boy damage, but it takes a lot of time to fire a shot.
//Kaga: Adjusted from 56 (Tier 4, 7*8) -> 30 (Tier 6, 5*6) ticks. 95 really wasn't big-boy damage anymore, although I updated it to 125 to remain consistent with the other 10x99mm caliber weapon (M42C). Now takes only twice as long as the M42A.
@@ -382,7 +382,7 @@
damage_mult = BASE_BULLET_DAMAGE_MULT
recoil = RECOIL_AMOUNT_TIER_1
-/obj/item/weapon/gun/rifle/sniper/XM42B/set_bullet_traits()
+/obj/item/weapon/gun/rifle/sniper/XM43E1/set_bullet_traits()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff),
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating),
@@ -415,7 +415,7 @@
force = 17
zoomdevicename = "scope"
flags_gun_features = GUN_AUTO_EJECTOR|GUN_WY_RESTRICTED|GUN_SPECIALIST|GUN_WIELDED_FIRING_ONLY|GUN_AMMO_COUNTER
- starting_attachment_types = list(/obj/item/attachable/sniperbarrel)
+ starting_attachment_types = list(/obj/item/attachable/pmc_sniperbarrel)
sniper_beam_type = /obj/effect/ebeam/laser/intense
sniper_beam_icon = "laser_beam_intense"
sniper_lockon_icon = "sniper_lockon_intense"
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/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm
index 821273247f66..761e77305254 100644
--- a/code/modules/projectiles/magazines/specialist.dm
+++ b/code/modules/projectiles/magazines/specialist.dm
@@ -27,14 +27,14 @@
default_ammo = /datum/ammo/bullet/sniper/flak
ammo_band_color = AMMO_BAND_COLOR_IMPACT
-//M42B Magazine
+//XM43E1 Magazine
/obj/item/ammo_magazine/sniper/anti_materiel
- name = "\improper XM42B marksman magazine (10x99mm)"
+ name = "\improper XM43E1 marksman magazine (10x99mm)"
desc = "A magazine of caseless 10x99mm anti-materiel rounds."
max_rounds = 8
caliber = "10x99mm"
default_ammo = /datum/ammo/bullet/sniper/anti_materiel
- gun_type = /obj/item/weapon/gun/rifle/sniper/XM42B
+ gun_type = /obj/item/weapon/gun/rifle/sniper/XM43E1
//M42C magazine
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 b2afd77d4aed..2ce4c992b80c 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 += "
"
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 += "
["wylogo.png"]])