cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes var/ inside all procs (#19450)

Browse Source 
* removes var/ inside all procs

* .

* ugh
This commit is contained in:
Kashargul
2026-05-05 10:55:17 +02:00
committed by GitHub
parent 13162d13a2
commit 5926589c16
1987 changed files with 7376 additions and 7377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/01_basic.dm
+2 -2
View File
@@ -6,7 +6,7 @@
var/vore_egg_type = "Egg" //The egg type they have.
var/autohiss = "Full" // VOREStation Add: Whether we have Autohiss on. I'm hijacking the egg panel bc this one has a shitton of unused space.
/datum/preferences/proc/set_biological_gender(var/gender)
/datum/preferences/proc/set_biological_gender(gender)
update_preference_by_type(/datum/preference/choiced/gender/biological, gender)
update_preference_by_type(/datum/preference/choiced/gender/identifying, gender)
@@ -27,7 +27,7 @@
pref.autohiss = sanitize_inlist(pref.autohiss, list("Off", "Basic", "Full"), initial(pref.autohiss))
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/general/basic/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/basic/copy_to_mob(mob/living/carbon/human/character)
var/char_real_name = pref.read_preference(/datum/preference/name/real_name)
var/char_bio_gender = pref.read_preference(/datum/preference/choiced/gender/biological)
var/char_id_gender = pref.read_preference(/datum/preference/choiced/gender/identifying)
code/modules/client/preference_setup/general/03_body.dm
+4 -4
View File
@@ -48,7 +48,7 @@
if(tail_style && !(tail_style in get_available_styles(GLOB.tail_styles_list)))
tail_style = null
/datum/preferences/proc/get_available_styles(var/style_list)
/datum/preferences/proc/get_available_styles(style_list)
. = list("Normal" = null)
var/pref_species = read_preference(/datum/preference/choiced/species)
for(var/path in style_list)
@@ -65,7 +65,7 @@
continue
.[instance.name] = instance
/datum/preferences/proc/mass_edit_marking_list(var/marking, var/change_on = TRUE, var/change_color = TRUE, var/marking_value = null, var/on = TRUE, var/color = "#000000")
/datum/preferences/proc/mass_edit_marking_list(marking, change_on = TRUE, change_color = TRUE, marking_value = null, on = TRUE, color = "#000000")
var/datum/sprite_accessory/marking/mark_datum = GLOB.body_marking_styles_list[marking]
var/list/new_marking = marking_value||mark_datum.body_parts
for (var/NM in new_marking)
@@ -150,7 +150,7 @@
pref.sanitize_body_styles()
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/general/body/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/body/copy_to_mob(mob/living/carbon/human/character)
// Copy basic values
character.h_style = pref.h_style
character.f_style = pref.f_style
@@ -239,7 +239,7 @@
O.markings[M] = list("color" = pref.body_markings[M][BP]["color"], "datum" = mark_datum, "priority" = priority, "on" = pref.body_markings[M][BP]["on"])
character.markings_len = priority
/datum/category_item/player_setup_item/general/body/proc/has_flag(var/datum/species/mob_species, var/flag)
/datum/category_item/player_setup_item/general/body/proc/has_flag(datum/species/mob_species, flag)
return mob_species && (mob_species.appearance_flags & flag)
/datum/category_item/player_setup_item/general/body/proc/reset_limbs()
code/modules/client/preference_setup/general/06_flavor.dm
+2 -2
View File
@@ -38,7 +38,7 @@
return
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/general/flavor/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/flavor/copy_to_mob(mob/living/carbon/human/character)
character.flavor_texts["general"] = pref.flavor_texts["general"]
character.flavor_texts["head"] = pref.flavor_texts["head"]
character.flavor_texts["face"] = pref.flavor_texts["face"]
@@ -81,7 +81,7 @@
log_admin("[user]/[user.ckey] set their custom link to [pref.custom_link]")
// README: This must stay for SetFlavorText to work!
/datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user)
/datum/category_item/player_setup_item/general/flavor/OnTopic(href,list/href_list, mob/user)
if(href_list["flavor_text"])
switch(href_list["flavor_text"])
if("open")
code/modules/client/preference_setup/general/07_antagonism.dm
+1 -1
View File
@@ -30,7 +30,7 @@
if(!pref.antag_vis) pref.antag_vis = "Hidden"
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/general/basic_antagonism/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/basic_antagonism/copy_to_mob(mob/living/carbon/human/character)
character.exploit_record = pref.exploit_record
character.antag_faction = pref.antag_faction
character.antag_vis = pref.antag_vis
code/modules/client/preference_setup/general/09_size.dm
+1 -1
View File
@@ -65,7 +65,7 @@
if(!(pref.species_sound))
pref.species_sound = "Unset"
/datum/category_item/player_setup_item/general/size/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/size/copy_to_mob(mob/living/carbon/human/character)
character.weight = pref.weight_vr
character.weight_gain = pref.weight_gain
character.weight_loss = pref.weight_loss
code/modules/client/preference_setup/general/11_misc.dm
+1 -1
View File
@@ -72,7 +72,7 @@
save_data["custom_heat"] = check_list_copy(pref.custom_heat)
save_data["custom_cold"] = check_list_copy(pref.custom_cold)
/datum/category_item/player_setup_item/general/vore_misc/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/vore_misc/copy_to_mob(mob/living/carbon/human/character)
character.custom_species = pref.custom_species
character.custom_say = lowertext(trim(pref.custom_say))
code/modules/client/preference_setup/general/12_traits.dm
+3 -3
View File
@@ -16,7 +16,7 @@
var/dirty_synth = 0 //Are you a synth
var/gross_meatbag = 0 //Where'd I leave my Voight-Kampff test kit?
/datum/preferences/proc/get_custom_bases_for_species(var/new_species)
/datum/preferences/proc/get_custom_bases_for_species(new_species)
if (!new_species)
new_species = read_preference(/datum/preference/choiced/species)
var/list/choices
@@ -33,7 +33,7 @@
choices = choices.Copy()
return choices
/datum/category_item/player_setup_item/general/traits/proc/get_pref_choice_from_trait(var/mob/user, var/datum/trait/trait, var/preference)
/datum/category_item/player_setup_item/general/traits/proc/get_pref_choice_from_trait(mob/user, datum/trait/trait, preference)
if (!trait || !preference)
return
var/list/trait_prefs
@@ -170,7 +170,7 @@
pref.custom_base = selected_species.default_custom_base
/datum/category_item/player_setup_item/general/traits/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/traits/copy_to_mob(mob/living/carbon/human/character)
if(character.isSynthetic()) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1
pref.gross_meatbag = 0
code/modules/client/preference_setup/general/13_nif.dm
+1 -1
View File
@@ -52,7 +52,7 @@
if(!islist(pref.nif_savedata))
pref.nif_savedata = list()
/datum/category_item/player_setup_item/general/nif/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/general/nif/copy_to_mob(mob/living/carbon/human/character)
//If you had a NIF...
if(istype(character) && ispath(pref.nif_path) && pref.nif_durability && !ismannequin(character))
new pref.nif_path(character, pref.nif_durability, pref.nif_savedata)
code/modules/client/preference_setup/loadout/01_equipment.dm
+3 -3
View File
@@ -34,7 +34,7 @@
save_data["no_jacket"] = pref.no_jacket
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/loadout/equipment/copy_to_mob(var/mob/living/carbon/human/character)
/datum/category_item/player_setup_item/loadout/equipment/copy_to_mob(mob/living/carbon/human/character)
character.all_underwear.Cut()
character.all_underwear_metadata.Cut()
@@ -138,7 +138,7 @@
return data
/datum/category_item/player_setup_item/loadout/equipment/proc/get_metadata(var/underwear_category, var/datum/gear_tweak/gt)
/datum/category_item/player_setup_item/loadout/equipment/proc/get_metadata(underwear_category, datum/gear_tweak/gt)
var/metadata = pref.all_underwear_metadata[underwear_category]
if(!metadata)
metadata = list()
@@ -150,7 +150,7 @@
metadata["[gt]"] = tweak_data
return tweak_data
/datum/category_item/player_setup_item/loadout/equipment/proc/set_metadata(var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata)
/datum/category_item/player_setup_item/loadout/equipment/proc/set_metadata(underwear_category, datum/gear_tweak/gt, new_metadata)
var/list/metadata = pref.all_underwear_metadata[underwear_category]
metadata["[gt]"] = new_metadata
code/modules/client/preference_setup/loadout/02_loadout.dm
+6 -6
View File
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
var/category = ""
var/list/gear = list()
/datum/loadout_category/New(var/cat)
/datum/loadout_category/New(cat)
category = cat
..()
@@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
return data
/datum/category_item/player_setup_item/loadout/loadout/proc/get_gear_metadata(var/datum/gear/G)
/datum/category_item/player_setup_item/loadout/loadout/proc/get_gear_metadata(datum/gear/G)
var/list/active_gear_list = LAZYACCESS(pref.gear_list, "[pref.gear_slot]")
// {"/datum/gear_tweak/custom_name": "" }
@@ -166,14 +166,14 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
if(!.)
. = list()
/datum/category_item/player_setup_item/loadout/loadout/proc/get_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak)
/datum/category_item/player_setup_item/loadout/loadout/proc/get_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak)
var/list/metadata = get_gear_metadata(G)
. = metadata["[tweak]"]
if(isnull(.))
. = tweak.get_default()
metadata["[tweak]"] = .
/datum/category_item/player_setup_item/loadout/loadout/proc/set_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak, var/new_metadata)
/datum/category_item/player_setup_item/loadout/loadout/proc/set_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak, new_metadata)
var/list/metadata = get_gear_metadata(G)
metadata["[tweak]"] = new_metadata
@@ -281,11 +281,11 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
var/path
var/location
/datum/gear_data/New(var/path, var/location)
/datum/gear_data/New(path, location)
src.path = path
src.location = location
/datum/gear/proc/spawn_item(var/location, var/metadata)
/datum/gear/proc/spawn_item(location, metadata)
var/datum/gear_data/gd = new(path, location)
if(length(gear_tweaks) && metadata)
for(var/datum/gear_tweak/gt in gear_tweaks)
code/modules/client/preference_setup/loadout/gear_tweaks.dm
+43 -43
View File
@@ -1,18 +1,18 @@
#define LOADOUT_BAN_STRING "Custom loadout"
/datum/gear_tweak/proc/get_contents(var/metadata)
/datum/gear_tweak/proc/get_contents(metadata)
return
/datum/gear_tweak/proc/get_metadata(var/user, var/metadata)
/datum/gear_tweak/proc/get_metadata(user, metadata)
return
/datum/gear_tweak/proc/get_default()
return
/datum/gear_tweak/proc/tweak_gear_data(var/metadata, var/datum/gear_data)
/datum/gear_tweak/proc/tweak_gear_data(metadata, datum/gear_data)
return
/datum/gear_tweak/proc/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/proc/tweak_item(obj/item/I, metadata)
return
/*
@@ -22,22 +22,22 @@
/datum/gear_tweak/color
var/list/valid_colors
/datum/gear_tweak/color/New(var/list/valid_colors)
/datum/gear_tweak/color/New(list/valid_colors)
src.valid_colors = valid_colors
..()
/datum/gear_tweak/color/get_contents(var/metadata)
/datum/gear_tweak/color/get_contents(metadata)
return "Color: <font color='[metadata]'>&#11044;</font>"
/datum/gear_tweak/color/get_default()
return valid_colors ? valid_colors[1] : COLOR_GRAY
/datum/gear_tweak/color/get_metadata(var/user, var/metadata, var/title = "Character Preference")
/datum/gear_tweak/color/get_metadata(user, metadata, title = "Character Preference")
if(valid_colors)
return tgui_input_list(user, "Choose a color.", title, valid_colors, metadata)
return tgui_color_picker(user, "Choose a color.", title, metadata)
/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/color/tweak_item(obj/item/I, metadata)
if(valid_colors && !(metadata in valid_colors))
return
if(!metadata || (metadata == "#ffffff"))
@@ -51,7 +51,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
/datum/gear_tweak/matrix_recolor
/datum/gear_tweak/matrix_recolor/get_contents(var/metadata)
/datum/gear_tweak/matrix_recolor/get_contents(metadata)
if(islist(metadata) && length(metadata))
return "Matrix Recolor: [english_list(metadata)]"
return "Matrix Recolor"
@@ -93,20 +93,20 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
/datum/gear_tweak/path
var/list/valid_paths
/datum/gear_tweak/path/New(var/list/valid_paths)
/datum/gear_tweak/path/New(list/valid_paths)
src.valid_paths = valid_paths
..()
/datum/gear_tweak/path/get_contents(var/metadata)
/datum/gear_tweak/path/get_contents(metadata)
return "Type: [metadata]"
/datum/gear_tweak/path/get_default()
return valid_paths[1]
/datum/gear_tweak/path/get_metadata(var/user, var/metadata)
/datum/gear_tweak/path/get_metadata(user, metadata)
return tgui_input_list(user, "Choose a type.", "Character Preference", valid_paths, metadata)
/datum/gear_tweak/path/tweak_gear_data(var/metadata, var/datum/gear_data/gear_data)
/datum/gear_tweak/path/tweak_gear_data(metadata, datum/gear_data/gear_data)
if(!(metadata in valid_paths))
return
gear_data.path = valid_paths[metadata]
@@ -122,7 +122,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
valid_contents = args.Copy()
..()
/datum/gear_tweak/contents/get_contents(var/metadata)
/datum/gear_tweak/contents/get_contents(metadata)
return "Contents: [english_list(metadata, and_text = ", ")]"
/datum/gear_tweak/contents/get_default()
@@ -130,7 +130,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
for(var/i = 1 to valid_contents.len)
. += "Random"
/datum/gear_tweak/contents/get_metadata(var/user, var/list/metadata)
/datum/gear_tweak/contents/get_metadata(user, list/metadata)
. = list()
for(var/i = metadata.len to valid_contents.len)
metadata += "Random"
@@ -141,7 +141,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
else
return metadata
/datum/gear_tweak/contents/tweak_item(var/obj/item/I, var/list/metadata)
/datum/gear_tweak/contents/tweak_item(obj/item/I, list/metadata)
if(metadata.len != valid_contents.len)
return
for(var/i = 1 to valid_contents.len)
@@ -168,22 +168,22 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
/datum/gear_tweak/reagents
var/list/valid_reagents
/datum/gear_tweak/reagents/New(var/list/reagents)
/datum/gear_tweak/reagents/New(list/reagents)
valid_reagents = reagents.Copy()
..()
/datum/gear_tweak/reagents/get_contents(var/metadata)
/datum/gear_tweak/reagents/get_contents(metadata)
return "Reagents: [metadata]"
/datum/gear_tweak/reagents/get_default()
return "Random"
/datum/gear_tweak/reagents/get_metadata(var/user, var/list/metadata)
/datum/gear_tweak/reagents/get_metadata(user, list/metadata)
. = tgui_input_list(user, "Choose an entry.", "Character Preference", valid_reagents + list("Random", "None"), metadata)
if(!.)
return metadata
/datum/gear_tweak/reagents/tweak_item(var/obj/item/I, var/list/metadata)
/datum/gear_tweak/reagents/tweak_item(obj/item/I, list/metadata)
if(metadata == "None")
return
if(metadata == "Random")
@@ -205,17 +205,17 @@ GLOBAL_DATUM_INIT(gear_tweak_free_name, /datum/gear_tweak/custom_name, new)
/datum/gear_tweak/custom_name
var/list/valid_custom_names
/datum/gear_tweak/custom_name/New(var/list/valid_custom_names)
/datum/gear_tweak/custom_name/New(list/valid_custom_names)
src.valid_custom_names = valid_custom_names
..()
/datum/gear_tweak/custom_name/get_contents(var/metadata)
/datum/gear_tweak/custom_name/get_contents(metadata)
return "Name: [metadata]"
/datum/gear_tweak/custom_name/get_default()
return ""
/datum/gear_tweak/custom_name/get_metadata(var/user, var/metadata)
/datum/gear_tweak/custom_name/get_metadata(user, metadata)
if(jobban_isbanned(user, LOADOUT_BAN_STRING))
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
@@ -229,7 +229,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_name, /datum/gear_tweak/custom_name, new)
return metadata
return san_input ? san_input : get_default()
/datum/gear_tweak/custom_name/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/custom_name/tweak_item(obj/item/I, metadata)
if(!metadata)
return I.name
I.name = metadata
@@ -242,17 +242,17 @@ GLOBAL_DATUM_INIT(gear_tweak_free_desc, /datum/gear_tweak/custom_desc, new)
/datum/gear_tweak/custom_desc
var/list/valid_custom_desc
/datum/gear_tweak/custom_desc/New(var/list/valid_custom_desc)
/datum/gear_tweak/custom_desc/New(list/valid_custom_desc)
src.valid_custom_desc = valid_custom_desc
..()
/datum/gear_tweak/custom_desc/get_contents(var/metadata)
/datum/gear_tweak/custom_desc/get_contents(metadata)
return "Description: [metadata]"
/datum/gear_tweak/custom_desc/get_default()
return ""
/datum/gear_tweak/custom_desc/get_metadata(var/user, var/metadata)
/datum/gear_tweak/custom_desc/get_metadata(user, metadata)
if(jobban_isbanned(user, LOADOUT_BAN_STRING))
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
@@ -266,7 +266,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_desc, /datum/gear_tweak/custom_desc, new)
return metadata
return san_input ? san_input : get_default()
/datum/gear_tweak/custom_desc/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/custom_desc/tweak_item(obj/item/I, metadata)
if(!metadata)
return I.desc
I.desc = metadata
@@ -279,13 +279,13 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/toggle_digestable
/datum/gear_tweak/toggle_digestable/get_contents(var/metadata)
/datum/gear_tweak/toggle_digestable/get_contents(metadata)
return "Digestable: [metadata ? "Yes" : "No"]"
/datum/gear_tweak/toggle_digestable/get_default()
return TRUE
/datum/gear_tweak/toggle_digestable/get_metadata(var/user, var/metadata)
/datum/gear_tweak/toggle_digestable/get_metadata(user, metadata)
var/san_input = tgui_alert(user, "Turn digestable on or off", "Toggle Digestable", list("Enable", "Disable", "Cancel"))
switch(san_input)
if("Enable")
@@ -294,7 +294,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
return FALSE
return metadata
/datum/gear_tweak/toggle_digestable/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/toggle_digestable/tweak_item(obj/item/I, metadata)
if(isnull(metadata))
return I.digestable
I.digestable = metadata
@@ -310,7 +310,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot)
var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link)
/datum/gear_tweak/tablet/get_contents(var/list/metadata)
/datum/gear_tweak/tablet/get_contents(list/metadata)
var/list/names = list()
var/obj/O = ValidProcessors[metadata[1]]
if(O)
@@ -335,7 +335,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
names += initial(O.name)
return "[english_list(names, and_text = ", ")]"
/datum/gear_tweak/tablet/get_metadata(var/user, var/metadata)
/datum/gear_tweak/tablet/get_metadata(user, metadata)
. = list()
var/list/names = list()
@@ -425,7 +425,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/tablet/get_default()
return list(1, 1, 1, 1, 1, 1, 1)
/datum/gear_tweak/tablet/tweak_item(var/obj/item/modular_computer/tablet/I, var/list/metadata)
/datum/gear_tweak/tablet/tweak_item(obj/item/modular_computer/tablet/I, list/metadata)
if(ValidProcessors[metadata[1]])
var/t = ValidProcessors[metadata[1]]
I.processor_unit = new t(I)
@@ -459,7 +459,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot)
var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link)
/datum/gear_tweak/laptop/get_contents(var/list/metadata)
/datum/gear_tweak/laptop/get_contents(list/metadata)
var/list/names = list()
var/obj/O = ValidProcessors[metadata[1]]
if(O)
@@ -484,7 +484,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
names += initial(O.name)
return "[english_list(names, and_text = ", ")]"
/datum/gear_tweak/laptop/get_metadata(var/user, var/metadata)
/datum/gear_tweak/laptop/get_metadata(user, metadata)
. = list()
var/list/names = list()
@@ -574,7 +574,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/laptop/get_default()
return list(1, 1, 1, 1, 1, 1, 1)
/datum/gear_tweak/laptop/tweak_item(var/obj/item/modular_computer/laptop/preset/I, var/list/metadata)
/datum/gear_tweak/laptop/tweak_item(obj/item/modular_computer/laptop/preset/I, list/metadata)
if(ValidProcessors[metadata[1]])
var/t = ValidProcessors[metadata[1]]
I.processor_unit = new t(I)
@@ -630,32 +630,32 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/implant_location/get_default()
return bodypart_names_to_tokens[1]
/datum/gear_tweak/implant_location/tweak_item(var/obj/item/implant/I, var/metadata)
/datum/gear_tweak/implant_location/tweak_item(obj/item/implant/I, metadata)
if(istype(I))
I.initialize_loc = bodypart_names_to_tokens[metadata] || BP_TORSO
/datum/gear_tweak/implant_location/get_contents(var/metadata)
/datum/gear_tweak/implant_location/get_contents(metadata)
return "Location: [metadata]"
/datum/gear_tweak/implant_location/get_metadata(var/user, var/metadata)
/datum/gear_tweak/implant_location/get_metadata(user, metadata)
var/list_input = tgui_input_list(user, "Select a bodypart for the implant to be implanted inside.", "Implant Location", bodypart_names_to_tokens || bodypart_tokens_to_names[BP_TORSO])
if(isnull(list_input))
return metadata
return list_input
/datum/gear_tweak/collar_tag/get_contents(var/metadata)
/datum/gear_tweak/collar_tag/get_contents(metadata)
return "Tag: [metadata]"
/datum/gear_tweak/collar_tag/get_default()
return ""
/datum/gear_tweak/collar_tag/get_metadata(var/user, var/metadata)
/datum/gear_tweak/collar_tag/get_metadata(user, metadata)
var/text_input = tgui_input_text(user, "Choose the tag text.", "Character Preference", metadata, MAX_NAME_LEN)
if(isnull(text_input))
return metadata
return text_input
/datum/gear_tweak/collar_tag/tweak_item(var/obj/item/clothing/accessory/collar/C, var/metadata)
/datum/gear_tweak/collar_tag/tweak_item(obj/item/clothing/accessory/collar/C, metadata)
if(metadata == "")
return ..()
else
code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
+1 -1
View File
@@ -29,7 +29,7 @@
// can't set description, it'll look funny
gear_tweaks = list(GLOB.gear_tweak_free_color_choice, GLOB.gear_tweak_free_name)
/datum/gear/cosmetic/nailpolish/spawn_item(var/location, var/metadata)
/datum/gear/cosmetic/nailpolish/spawn_item(location, metadata)
var/obj/item/nailpolish/polish = ..()
polish.set_colour(polish.color)
polish.color = null
code/modules/client/preference_setup/loadout/loadout_item_tf.dm
+7 -7
View File
@@ -2,7 +2,7 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
/datum/gear_tweak/item_tf_spawn
/datum/gear_tweak/item_tf_spawn/get_contents(var/metadata)
/datum/gear_tweak/item_tf_spawn/get_contents(metadata)
if(!islist(metadata) || metadata["state"] == "Not Enabled")
return "Item TF spawnpoint: Not Enabled"
else if(metadata["state"] == "Anyone")
@@ -15,7 +15,7 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
.["state"] = "Not Enabled"
.["valid"] = list()
/datum/gear_tweak/item_tf_spawn/get_metadata(var/user, var/list/metadata)
/datum/gear_tweak/item_tf_spawn/get_metadata(user, list/metadata)
. = get_default()
metadata = islist(metadata) ? metadata : .
var/entry = tgui_input_list(user, "Choose an entry.", "Character Preference", list("Not Enabled", "Anyone", "Only Specific Players"), metadata["state"])
@@ -29,7 +29,7 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
else
return metadata
/datum/gear_tweak/item_tf_spawn/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/item_tf_spawn/tweak_item(obj/item/I, metadata)
if(!islist(metadata))
return
if(metadata["state"] == "Not Enabled")
@@ -43,20 +43,20 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
/datum/gear_tweak/simplemob_picker
var/list/simplemob_list
/datum/gear_tweak/simplemob_picker/New(var/list/valid_simplemobs)
/datum/gear_tweak/simplemob_picker/New(list/valid_simplemobs)
src.simplemob_list = valid_simplemobs
..()
/datum/gear_tweak/simplemob_picker/get_contents(var/metadata)
/datum/gear_tweak/simplemob_picker/get_contents(metadata)
return "Type: [metadata]"
/datum/gear_tweak/simplemob_picker/get_default()
return simplemob_list[1]
/datum/gear_tweak/simplemob_picker/get_metadata(var/user, var/metadata)
/datum/gear_tweak/simplemob_picker/get_metadata(user, metadata)
return tgui_input_list(user, "Choose a type.", "Character Preference", simplemob_list, metadata)
/datum/gear_tweak/simplemob_picker/tweak_item(var/obj/item/capture_crystal/I, var/metadata)
/datum/gear_tweak/simplemob_picker/tweak_item(obj/item/capture_crystal/I, metadata)
if(!(metadata in simplemob_list))
return
if(!istype(I))
code/modules/client/preference_setup/preference_setup.dm
+8 -8
View File
@@ -37,7 +37,7 @@
var/datum/preferences/preferences
var/datum/category_group/player_setup_category/selected_category = null
/datum/category_collection/player_setup_collection/New(var/datum/preferences/preferences)
/datum/category_collection/player_setup_collection/New(datum/preferences/preferences)
src.preferences = preferences
..()
selected_category = categories[1]
@@ -67,7 +67,7 @@
for(var/datum/category_group/player_setup_category/PS in categories)
PS.save_preferences(savefile)
/datum/category_collection/player_setup_collection/proc/copy_to_mob(var/mob/living/carbon/human/C)
/datum/category_collection/player_setup_collection/proc/copy_to_mob(mob/living/carbon/human/C)
for(var/datum/category_group/player_setup_category/PS in categories)
PS.copy_to_mob(C)
@@ -81,7 +81,7 @@
dat += "<a href='byond://?src=\ref[src];game_prefs=1'>Game Options</a>"
return dat
/datum/category_collection/player_setup_collection/Topic(var/href,var/list/href_list)
/datum/category_collection/player_setup_collection/Topic(href,list/href_list)
if(..())
return 1
var/mob/user = usr
@@ -139,7 +139,7 @@
for(var/datum/category_item/player_setup_item/PI in items)
PI.save_preferences(savefile)
/datum/category_group/player_setup_category/proc/copy_to_mob(var/mob/living/carbon/human/C)
/datum/category_group/player_setup_category/proc/copy_to_mob(mob/living/carbon/human/C)
for(var/datum/category_item/player_setup_item/PI in items)
PI.copy_to_mob(C)
@@ -189,7 +189,7 @@
/*
* Called when the item is asked to apply its per character settings to a new mob.
*/
/datum/category_item/player_setup_item/proc/copy_to_mob(var/mob/living/carbon/human/C)
/datum/category_item/player_setup_item/proc/copy_to_mob(mob/living/carbon/human/C)
return
/datum/category_item/player_setup_item/proc/sanitize_character()
@@ -198,7 +198,7 @@
/datum/category_item/player_setup_item/proc/sanitize_preferences()
return
/datum/category_item/player_setup_item/Topic(var/href,var/list/href_list)
/datum/category_item/player_setup_item/Topic(href,list/href_list)
if(..())
return 1
var/mob/pref_mob = preference_mob()
@@ -215,10 +215,10 @@
if(. & TOPIC_REFRESH)
pref_mob.client.prefs.ShowChoices(usr)
/datum/category_item/player_setup_item/CanUseTopic(var/mob/user)
/datum/category_item/player_setup_item/CanUseTopic(mob/user)
return 1
/datum/category_item/player_setup_item/proc/OnTopic(var/href,var/list/href_list, var/mob/user)
/datum/category_item/player_setup_item/proc/OnTopic(href,list/href_list, mob/user)
return TOPIC_NOACTION
/datum/category_item/player_setup_item/proc/preference_mob()