mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-20 20:54:35 +01:00
[MIRROR] More globals (#12530)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
de8fed65df
commit
4f5dce5ebe
@@ -304,10 +304,10 @@
|
||||
|
||||
if("spawnpoint")
|
||||
var/list/spawnkeys = list()
|
||||
for(var/spawntype in spawntypes)
|
||||
for(var/spawntype in GLOB.spawntypes)
|
||||
spawnkeys += spawntype
|
||||
var/choice = tgui_input_list(user, "Where would you like to spawn when late-joining?", "Late-Join Choice", spawnkeys)
|
||||
if(!choice || !spawntypes[choice])
|
||||
if(!choice || !GLOB.spawntypes[choice])
|
||||
return TOPIC_NOACTION
|
||||
pref.update_preference_by_type(/datum/preference/choiced/living/spawnpoint, choice)
|
||||
return TOPIC_REFRESH
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
var/list/loadout_categories = list()
|
||||
var/list/gear_datums = list()
|
||||
GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
|
||||
|
||||
/datum/loadout_category
|
||||
var/category = ""
|
||||
@@ -31,8 +31,8 @@ var/list/gear_datums = list()
|
||||
if(!loadout_categories[use_category])
|
||||
loadout_categories[use_category] = new /datum/loadout_category(use_category)
|
||||
var/datum/loadout_category/LC = loadout_categories[use_category]
|
||||
gear_datums[use_name] = new G
|
||||
LC.gear[use_name] = gear_datums[use_name]
|
||||
GLOB.gear_datums[use_name] = new G
|
||||
LC.gear[use_name] = GLOB.gear_datums[use_name]
|
||||
|
||||
loadout_categories = sortAssoc(loadout_categories)
|
||||
for(var/loadout_category in loadout_categories)
|
||||
@@ -97,12 +97,12 @@ var/list/gear_datums = list()
|
||||
|
||||
var/total_cost = 0
|
||||
for(var/gear_name in active_gear_list)
|
||||
if(!gear_datums[gear_name])
|
||||
if(!GLOB.gear_datums[gear_name])
|
||||
to_chat(preference_mob, span_warning("You cannot have the \the [gear_name]."))
|
||||
active_gear_list -= gear_name
|
||||
continue
|
||||
|
||||
var/datum/gear/G = gear_datums[gear_name]
|
||||
var/datum/gear/G = GLOB.gear_datums[gear_name]
|
||||
if(!is_valid_gear(G))
|
||||
to_chat(preference_mob, span_warning("You cannot take \the [gear_name] as you are not whitelisted for the species or item."))
|
||||
active_gear_list -= gear_name
|
||||
@@ -124,7 +124,7 @@ var/list/gear_datums = list()
|
||||
|
||||
var/list/gear_tweaks = list()
|
||||
for(var/item in active_gear_list)
|
||||
var/datum/gear/G = gear_datums[item]
|
||||
var/datum/gear/G = GLOB.gear_datums[item]
|
||||
var/list/tweaks = list()
|
||||
for(var/datum/gear_tweak/tweak in G.gear_tweaks)
|
||||
UNTYPED_LIST_ADD(tweaks, list(
|
||||
@@ -185,7 +185,7 @@ var/list/gear_datums = list()
|
||||
var/list/active_gear_list = LAZYACCESS(pref.gear_list, "[pref.gear_slot]")
|
||||
. = 0
|
||||
for(var/gear_name in active_gear_list)
|
||||
var/datum/gear/G = gear_datums[gear_name]
|
||||
var/datum/gear/G = GLOB.gear_datums[gear_name]
|
||||
if(G)
|
||||
. += G.cost
|
||||
|
||||
@@ -232,7 +232,7 @@ var/list/gear_datums = list()
|
||||
return TOPIC_REFRESH
|
||||
|
||||
if("toggle_gear")
|
||||
var/datum/gear/TG = gear_datums[params["gear"]]
|
||||
var/datum/gear/TG = GLOB.gear_datums[params["gear"]]
|
||||
if(TG)
|
||||
if(TG.display_name in active_gear_list)
|
||||
active_gear_list -= TG.display_name
|
||||
@@ -241,7 +241,7 @@ var/list/gear_datums = list()
|
||||
return TOPIC_REFRESH_UPDATE_PREVIEW
|
||||
|
||||
if("gear_tweak")
|
||||
var/datum/gear/gear = gear_datums[params["gear"]]
|
||||
var/datum/gear/gear = GLOB.gear_datums[params["gear"]]
|
||||
var/datum/gear_tweak/tweak = locate(params["tweak"])
|
||||
if(!tweak || !gear || !(tweak in gear.gear_tweaks))
|
||||
return TOPIC_HANDLED
|
||||
|
||||
@@ -633,7 +633,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
character.species.deform = character.species.get_icobase(get_deform = TRUE)
|
||||
character.species.vanity_base_fit = bodytype_selected
|
||||
if(istype(character.species, /datum/species/shapeshifter))
|
||||
wrapped_species_by_ref["\ref[character]"] = bodytype_selected
|
||||
GLOB.wrapped_species_by_ref["\ref[character]"] = bodytype_selected
|
||||
|
||||
character.custom_species = custom_species
|
||||
character.custom_say = lowertext(trim(custom_say))
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
var/list/spawntypes = list()
|
||||
GLOBAL_LIST_INIT(spawntypes, populate_spawn_points())
|
||||
|
||||
/proc/populate_spawn_points()
|
||||
spawntypes = list()
|
||||
var/list/spawns = list()
|
||||
for(var/type in subtypesof(/datum/spawnpoint))
|
||||
var/datum/spawnpoint/S = new type()
|
||||
spawntypes[S.display_name] = S
|
||||
var/datum/spawnpoint/spawn_point = new type()
|
||||
spawns[spawn_point.display_name] = spawn_point
|
||||
return spawns
|
||||
|
||||
/proc/get_spawn_points()
|
||||
if(!LAZYLEN(spawntypes))
|
||||
populate_spawn_points()
|
||||
return spawntypes
|
||||
return GLOB.spawntypes
|
||||
|
||||
/datum/spawnpoint
|
||||
var/msg //Message to display on the arrivals computer.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var/global/client_record_update_lock = FALSE
|
||||
GLOBAL_VAR_INIT(client_record_update_lock, FALSE)
|
||||
|
||||
// Manually updating records from medical console to a player's save.
|
||||
/proc/get_current_mob_from_record(var/datum/data/record/active)
|
||||
@@ -43,15 +43,15 @@ var/global/client_record_update_lock = FALSE
|
||||
record_string = "security"
|
||||
console_path = /obj/machinery/computer/secure_data
|
||||
|
||||
if(client_record_update_lock)
|
||||
if(GLOB.client_record_update_lock)
|
||||
to_chat(user,"Update already in progress! Please wait a moment...")
|
||||
if(COM && !QDELETED(COM))
|
||||
COM.visible_message(span_notice("\The [COM] buzzes!"))
|
||||
playsound(COM, 'sound/machines/deniedbeep.ogg', 50, 0)
|
||||
return "Update already in progress! Please wait a moment..."
|
||||
client_record_update_lock = TRUE
|
||||
GLOB.client_record_update_lock = TRUE
|
||||
spawn(60 SECONDS)
|
||||
client_record_update_lock = FALSE
|
||||
GLOB.client_record_update_lock = FALSE
|
||||
|
||||
if(!active || !console_path)
|
||||
if(COM && !QDELETED(COM))
|
||||
|
||||
Reference in New Issue
Block a user