cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 12:13:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] digestion toggle geartweak (#12344)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-02-01 10:30:57 -07:00
committed by GitHub
parent 73d7d5ac3d
commit d9d29ce17a
25 changed files with 176 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/01_equipment.dm
+1 -1
View File
@@ -199,7 +199,7 @@
if(!gt)
return TOPIC_NOACTION
var/new_metadata = gt.get_metadata(user, get_metadata(underwear, gt))
if(new_metadata)
if(!isnull(new_metadata))
set_metadata(underwear, gt, new_metadata)
return TOPIC_REFRESH_UPDATE_PREVIEW
code/modules/client/preference_setup/loadout/02_loadout.dm
+3 -3
View File
@@ -173,7 +173,7 @@ var/list/gear_datums = list()
/datum/category_item/player_setup_item/loadout/loadout/proc/get_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak)
var/list/metadata = get_gear_metadata(G)
. = metadata["[tweak]"]
if(!.)
if(isnull(.))
. = tweak.get_default()
metadata["[tweak]"] = .
@@ -250,7 +250,7 @@ var/list/gear_datums = list()
metadata = tweak.get_metadata(user, get_tweak_metadata(gear, tweak), gear)
else
metadata = tweak.get_metadata(user, get_tweak_metadata(gear, tweak))
if(!metadata)
if(isnull(metadata))
return TOPIC_HANDLED
set_tweak_metadata(gear, tweak, metadata)
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -276,7 +276,7 @@ var/list/gear_datums = list()
if(!description)
var/obj/O = path
description = initial(O.desc)
gear_tweaks = list(gear_tweak_free_name, gear_tweak_free_desc, GLOB.gear_tweak_item_tf_spawn, GLOB.gear_tweak_free_matrix_recolor)
gear_tweaks = list(GLOB.gear_tweak_free_name, GLOB.gear_tweak_free_desc, GLOB.gear_tweak_item_tf_spawn, GLOB.gear_tweak_free_matrix_recolor, GLOB.gear_tweak_free_digestable)
/datum/gear_data
var/path
code/modules/client/preference_setup/loadout/gear_tweaks.dm
+52 -8
View File
@@ -193,14 +193,14 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
I.reagents.add_reagent(., I.reagents.get_free_space())
//Custom name and desciption code
//note to devs downstream: where 'gear_tweaks = list(gear_tweak_free_color_choice)' was used before for color selection
//in the loadout, now 'gear_tweaks += gear_tweak_free_color_choice' will need to be used, otherwise the item will not
//note to devs downstream: where 'gear_tweaks = list(GLOB.gear_tweak_free_color_choice)' was used before for color selection
//in the loadout, now 'gear_tweaks += GLOB.gear_tweak_free_color_choice' will need to be used, otherwise the item will not
// be able to be given a custom name or description
/*
Custom Name
*/
var/datum/gear_tweak/custom_name/gear_tweak_free_name = new()
GLOBAL_DATUM_INIT(gear_tweak_free_name, /datum/gear_tweak/custom_name, new)
/datum/gear_tweak/custom_name
var/list/valid_custom_names
@@ -220,8 +220,13 @@ var/datum/gear_tweak/custom_name/gear_tweak_free_name = new()
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
if(valid_custom_names)
return tgui_input_list(user, "Choose an item name.", "Character Preference", valid_custom_names, metadata)
var/list_input = tgui_input_list(user, "Choose an item name.", "Character Preference", valid_custom_names, metadata)
if(isnull(list_input))
return metadata
return list_input ? list_input : get_default()
var/san_input = tgui_input_text(user, "Choose the item's name. Leave it blank to use the default name.", "Item Name", metadata, MAX_LNAME_LEN)
if(isnull(san_input))
return metadata
return san_input ? san_input : get_default()
/datum/gear_tweak/custom_name/tweak_item(var/obj/item/I, var/metadata)
@@ -232,7 +237,7 @@ var/datum/gear_tweak/custom_name/gear_tweak_free_name = new()
/*
Custom Description
*/
var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
GLOBAL_DATUM_INIT(gear_tweak_free_desc, /datum/gear_tweak/custom_desc, new)
/datum/gear_tweak/custom_desc
var/list/valid_custom_desc
@@ -252,8 +257,13 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
if(valid_custom_desc)
return tgui_input_list(user, "Choose an item description.", "Character Preference",valid_custom_desc, metadata)
var/list_input = tgui_input_list(user, "Choose an item description.", "Character Preference",valid_custom_desc, metadata)
if(isnull(list_input))
return metadata
return list_input ? list_input : get_default()
var/san_input = tgui_input_text(user, "Choose the item's description. Leave it blank to use the default description.", "Item Description", metadata, MAX_MESSAGE_LEN, TRUE, prevent_enter = TRUE)
if(isnull(san_input))
return metadata
return san_input ? san_input : get_default()
/datum/gear_tweak/custom_desc/tweak_item(var/obj/item/I, var/metadata)
@@ -261,6 +271,34 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
return I.desc
I.desc = metadata
/*
Toggle Digestable
*/
GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestable, new)
/datum/gear_tweak/toggle_digestable
/datum/gear_tweak/toggle_digestable/get_contents(var/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)
var/san_input = tgui_alert(user, "Turn digestable on or off", "Toggle Digestable", list("Enable", "Disable", "Cancel"))
switch(san_input)
if("Enable")
return TRUE
if("Disable")
return FALSE
return metadata
/datum/gear_tweak/toggle_digestable/tweak_item(var/obj/item/I, var/metadata)
if(isnull(metadata))
return I.digestable
I.digestable = metadata
//end of custom description
/datum/gear_tweak/tablet
@@ -600,7 +638,10 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
return "Location: [metadata]"
/datum/gear_tweak/implant_location/get_metadata(var/user, var/metadata)
return (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]))
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)
return "Tag: [metadata]"
@@ -609,7 +650,10 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
return ""
/datum/gear_tweak/collar_tag/get_metadata(var/user, var/metadata)
return tgui_input_text(user, "Choose the tag text", "Character Preference", metadata, MAX_NAME_LEN)
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)
if(metadata == "")
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+13 -13
View File
@@ -23,7 +23,7 @@
/datum/gear/accessory/armband/colored/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/wallet
display_name = "wallet, orange"
@@ -41,7 +41,7 @@
/datum/gear/accessory/wallet/womens/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/clutch
display_name = "clutch bag"
@@ -50,7 +50,7 @@
/datum/gear/accessory/clutch/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/purse
display_name = "purse"
@@ -59,7 +59,7 @@
/datum/gear/accessory/purse/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/wcoat
display_name = "waistcoat selection"
@@ -138,7 +138,7 @@
/datum/gear/accessory/scarfcolor/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/jacket
display_name = "suit jacket selection"
@@ -222,7 +222,7 @@
/datum/gear/accessory/virginkiller/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/bracelet/material
display_name = "bracelet selection"
@@ -270,7 +270,7 @@
/datum/gear/accessory/sash/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/asym
display_name = "asymmetric jacket selection"
@@ -356,7 +356,7 @@
/datum/gear/accessory/wristband/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/wristband_collection
display_name = "wristbands (selection)"
@@ -385,7 +385,7 @@
/datum/gear/choker/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/collar
display_name = "collar, silver"
@@ -455,7 +455,7 @@
/datum/gear/accessory/flops/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/dosimeter
display_name = "Dosimeter"
@@ -568,7 +568,7 @@ Talon pin
"Studded Belt" = /obj/item/clothing/accessory/belt/studded
)
gear_tweaks += new/datum/gear_tweak/path(wristband_lists)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/bunny_tail
display_name = "bunny tail, colorable"
@@ -576,7 +576,7 @@ Talon pin
/datum/gear/accessory/bunny_tail/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/legwarmer_selection
display_name = "legwarmers (selection, colorable)"
@@ -590,4 +590,4 @@ Talon pin
"Legwarmers, short" = /obj/item/clothing/accessory/legwarmersshort
)
gear_tweaks += new/datum/gear_tweak/path(legwarmer_lists)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/datum/gear/cosmetic/nailpolish/New()
..()
// can't set description, it'll look funny
gear_tweaks = list(gear_tweak_free_color_choice, gear_tweak_free_name)
gear_tweaks = list(GLOB.gear_tweak_free_color_choice, GLOB.gear_tweak_free_name)
/datum/gear/cosmetic/nailpolish/spawn_item(var/location, var/metadata)
var/obj/item/nailpolish/polish = ..()
code/modules/client/preference_setup/loadout/loadout_cyberware.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/datum/gear/utility/implant/generic/New()
..()
gear_tweaks += global.gear_tweak_implant_location
gear_tweaks += GLOB.gear_tweak_implant_location
/datum/gear/utility/implant/eal
display_name = "vocal synthesizer, EAL"
code/modules/client/preference_setup/loadout/loadout_ears.dm
+1 -1
View File
@@ -54,4 +54,4 @@
earringscolour["dangle"] = /obj/item/clothing/ears/earring/dangle
gear_tweaks += new/datum/gear_tweak/path(earringscolour)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+4 -4
View File
@@ -13,7 +13,7 @@
/datum/gear/eyes/eyepatchwhite/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/eyes/blindfold
display_name = "blindfold"
@@ -25,7 +25,7 @@
/datum/gear/eyes/whiteblindfold/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/eyes/thinblindfold
display_name = "blindfold, thin white (recolorable)"
@@ -33,7 +33,7 @@
/datum/gear/eyes/thinblindfold/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/eyes/glasses
display_name = "Glasses, prescription"
@@ -202,7 +202,7 @@
/datum/gear/eyes/arglasses_visor/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks = list(GLOB.gear_tweak_free_color_choice)
/datum/gear/eyes/arglasses_sec
display_name = "AR-Security glasses"
code/modules/client/preference_setup/loadout/loadout_fluffitems.dm
+1 -1
View File
@@ -1506,7 +1506,7 @@
/datum/gear/fluff/dessa_hat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/fluff/casey_glasses
path = /obj/item/clothing/glasses/big_round
code/modules/client/preference_setup/loadout/loadout_general.dm
+2 -2
View File
@@ -159,7 +159,7 @@
/datum/gear/towel/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/cahwhite
display_name = "Cards Against The Galaxy (white deck)"
@@ -313,7 +313,7 @@
toytype["Bone"] = /obj/item/toy/chewtoy/poly
toytype["Classic"] = /obj/item/toy/chewtoy/tall/poly
gear_tweaks += new/datum/gear_tweak/path(toytype)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/ducky
display_name = "rubber ducky"
code/modules/client/preference_setup/loadout/loadout_gloves.dm
+4 -4
View File
@@ -44,7 +44,7 @@
/datum/gear/gloves/evening/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/gloves/duty
display_name = "gloves, work"
@@ -74,7 +74,7 @@
"recolourable, long"=/obj/item/clothing/gloves/fingerless_recolourable/long
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/gloves/ring
display_name = "ring selection"
@@ -136,7 +136,7 @@
/datum/gear/gloves/colored/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/gloves/latex/colorable
display_name = "gloves, latex, colorable"
@@ -144,7 +144,7 @@
/datum/gear/gloves/latex/colorable/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/gloves/siren
display_name = "gloves, Siren"
code/modules/client/preference_setup/loadout/loadout_head.dm
+19 -19
View File
@@ -78,7 +78,7 @@
/datum/gear/head/cap/white/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/halo
display_name = "halo (colorable)"
@@ -86,7 +86,7 @@
/datum/gear/head/halo/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/cap/sol
display_name = "cap, sol"
@@ -134,7 +134,7 @@
/datum/gear/head/hairflower/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/pin
display_name = "pin selection"
@@ -205,7 +205,7 @@
/datum/gear/head/hijab/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/kippa
display_name = "kippa"
@@ -213,7 +213,7 @@
/datum/gear/head/kippa/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/turban
display_name = "turban"
@@ -221,7 +221,7 @@
/datum/gear/head/turban/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/taqiyah
display_name = "taqiyah"
@@ -229,7 +229,7 @@
/datum/gear/head/taqiyah/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/kitty
display_name = "kitty ears"
@@ -246,7 +246,7 @@
/datum/gear/head/rabbit/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/beanie
display_name = "beanie"
@@ -254,7 +254,7 @@
/datum/gear/head/beanie/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/loose_beanie
display_name = "loose beanie"
@@ -262,7 +262,7 @@
/datum/gear/head/loose_beanie/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/beretg
display_name = "beret"
@@ -270,7 +270,7 @@
/datum/gear/head/beretg/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/sombrero
display_name = "sombrero"
@@ -282,7 +282,7 @@
/datum/gear/head/flatcapg/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/bow/small
display_name = "hair bow, small (colorable)"
@@ -290,7 +290,7 @@
/datum/gear/head/bow/small/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/welding
display_name = "welding mask selection"
@@ -422,7 +422,7 @@
/datum/gear/head/giantbow/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/bows
display_name = "hair bow selection, colorable"
@@ -436,7 +436,7 @@
"back bow"=/obj/item/clothing/head/bow/back,
"sweet bow"=/obj/item/clothing/head/bow/sweet
)
gear_tweaks += list(new/datum/gear_tweak/path(bows), gear_tweak_free_color_choice)
gear_tweaks += list(new/datum/gear_tweak/path(bows), GLOB.gear_tweak_free_color_choice)
/datum/gear/head/pilot
display_name = "pilot helmets selection"
@@ -460,7 +460,7 @@
/datum/gear/head/headbando/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/maid
display_name = "maid headband selection"
@@ -502,7 +502,7 @@
/datum/gear/head/magic_hat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/wedding
display_name = "wedding veil"
@@ -510,7 +510,7 @@
/datum/gear/head/wedding/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/halo/alt
display_name = "halo, alt"
@@ -522,7 +522,7 @@
/datum/gear/head/buckethat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/head/nonla
display_name = "hat, non la"
code/modules/client/preference_setup/loadout/loadout_mask.dm
+2 -2
View File
@@ -88,7 +88,7 @@
path = /obj/item/clothing/mask/lacemask
/datum/gear/mask/lace/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/mask/half
display_name = "black half-mask"
@@ -99,7 +99,7 @@
path = /obj/item/clothing/mask/luchador/colorable
/datum/gear/mask/wrestling/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/mask/masquerade
display_name = "masquerade mask selection"
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+9 -9
View File
@@ -43,7 +43,7 @@
/datum/gear/shoes/colorboots/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/jackboots_white
display_name = "jackboots, white"
@@ -131,7 +131,7 @@
/datum/gear/shoes/flipflops/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/athletic
display_name = "athletic shoes"
@@ -139,7 +139,7 @@
/datum/gear/shoes/athletic/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/skater
display_name = "skater shoes"
@@ -147,7 +147,7 @@
/datum/gear/shoes/skater/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/flats
display_name = "flats"
@@ -155,7 +155,7 @@
/datum/gear/shoes/flats/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/cowboy
display_name = "cowboy boots selection"
@@ -201,7 +201,7 @@
/datum/gear/shoes/heels/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/slippers
display_name = "bunny slippers"
@@ -260,7 +260,7 @@
/datum/gear/shoes/ballet/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/halfmoon
display_name = "half moon boots"
@@ -272,7 +272,7 @@
/datum/gear/shoes/sandals/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/black/cuffs
display_name = "legwraps, black"
@@ -316,7 +316,7 @@
/datum/gear/shoes/sandals_elegant/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
//CHOMP ADDITION, trying to make a no shoes shoe option
/datum/gear/shoes/none
code/modules/client/preference_setup/loadout/loadout_suit.dm
+22 -23
View File
@@ -12,7 +12,7 @@
/datum/gear/suit/apron_white/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/greatcoat
display_name = "greatcoat"
@@ -97,7 +97,7 @@
/datum/gear/suit/duster/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/duster_sleeveless
display_name = "cowboy duster, colorable, sleeveless"
@@ -105,7 +105,7 @@
/datum/gear/suit/duster_sleeveless/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/hazard_vest
display_name = "hazard vest selection"
@@ -331,7 +331,7 @@
/datum/gear/suit/cloak_custom/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/ranger_poncho
display_name = "ranger poncho selection"
@@ -360,7 +360,7 @@
/datum/gear/suit/neo_ranger/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/unathi_robe
display_name = "roughspun robe"
@@ -619,7 +619,7 @@
/datum/gear/suit/flannelrecolour/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/denim_jacket
display_name = "denim jacket and vest selection"
@@ -669,7 +669,7 @@
/datum/gear/suit/miscellaneous/peacoat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/snowsuit
display_name = "snowsuit"
@@ -717,7 +717,7 @@
/datum/gear/suit/miscellaneous/cardigan/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/cmddressjacket
display_name = "command dress jacket"
@@ -731,7 +731,7 @@
/datum/gear/suit/miscellaneous/kimono/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/miscellaneous/kamishimo
display_name = "traditional kamishimo, colorable"
@@ -739,7 +739,7 @@
/datum/gear/suit/miscellaneous/kamishimo/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/miscellaneous/kimono_select
display_name = "kimono selection"
@@ -773,7 +773,7 @@
"very high cropped hoodie"=/obj/item/clothing/suit/storage/croppedhoodie/croppierer,
"super high cropped hoodie"=/obj/item/clothing/suit/storage/croppedhoodie/croppiest
)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
gear_tweaks += new/datum/gear_tweak/path(croppedhoodies)
/datum/gear/suit/drive
@@ -833,7 +833,7 @@
/datum/gear/suit/labcoat_colorable/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/labcoat_old
display_name = "labcoat, old-school"
@@ -939,7 +939,7 @@
/datum/gear/suit/oversize/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/*
Talon winter coat
@@ -975,7 +975,7 @@ Talon winter coat
var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style
hoodies[initial(hoodie.name)] = hoodie
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies))
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/cyberpunk_recolorable
display_name = "cyberpunk jacket (recolorable)"
@@ -983,7 +983,7 @@ Talon winter coat
cost = 2 //It's got armor, yo.
/datum/gear/suit/cyberpunk_recolorable/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/shrine_maiden
display_name = "shrine maiden costume"
@@ -1013,7 +1013,7 @@ Talon winter coat
cost = 1
/datum/gear/suit/cloak_half/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
//Shoulder cloak
/datum/gear/suit/cloak_shoulder
@@ -1022,7 +1022,7 @@ Talon winter coat
cost = 1
/datum/gear/suit/cloak_shoulder/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/cloak_shoulder_right
display_name = "cloak, shoulder right"
@@ -1030,7 +1030,7 @@ Talon winter coat
cost = 1
/datum/gear/suit/cloak_shoulder_right/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
//Mantles, mostly for heads of staff
/datum/gear/suit/roles/mantle
@@ -1039,7 +1039,7 @@ Talon winter coat
cost = 1
/datum/gear/suit/roles/mantle/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/roles/mantles
display_name = "mantle selection"
@@ -1066,7 +1066,7 @@ Talon winter coat
/datum/gear/suit/roles/boatcloak/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/roles/capboatcloak
display_name = "boat cloak, site manager"
@@ -1104,7 +1104,7 @@ Talon winter coat
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud
/datum/gear/suit/roles/shroud/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/roles/capshroud
display_name = "shroud, site manager"
@@ -1168,7 +1168,7 @@ Talon winter coat
"cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped,
"shortsleeve hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/shortsleeve
)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
gear_tweaks += new/datum/gear_tweak/path(choodies)
//ABOUT TIME SOMEONE ADDED THIS TO A LOADOUT
@@ -1203,4 +1203,3 @@ Talon winter coat
display_name = "medical coat"
path = /obj/item/clothing/suit/neo_medical_coat
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,JOB_TALON_DOCTOR)
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+19 -19
View File
@@ -60,7 +60,7 @@
/datum/gear/uniform/qipao_colorable/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/qipao2_colorable
display_name = "qipao, colorable, slim"
@@ -68,7 +68,7 @@
/datum/gear/uniform/qipao2_colorable/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/skirt
display_name = "skirt selection"
@@ -198,7 +198,7 @@
/datum/gear/uniform/shortplaindress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/longdress
display_name = "long dress"
@@ -206,7 +206,7 @@
/datum/gear/uniform/longdress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/longwidedress
display_name = "long wide dress"
@@ -214,7 +214,7 @@
/datum/gear/uniform/longwidedress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/loincloth
display_name = "loincloth"
@@ -222,7 +222,7 @@
/datum/gear/uniform/loincloth/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/reddress
display_name = "red dress with belt"
@@ -269,7 +269,7 @@
/datum/gear/uniform/yogapants/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/black_corset
display_name = "black corset"
@@ -336,7 +336,7 @@
/datum/gear/uniform/pleated/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/lilacdress
display_name = "lilac dress"
@@ -428,7 +428,7 @@
/datum/gear/uniform/floofdress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/blackngold
display_name = "black and gold gown"
@@ -480,7 +480,7 @@
/datum/gear/uniform/flowerskirt/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/countess
display_name = "countess dress"
@@ -496,7 +496,7 @@
/datum/gear/uniform/fashionminiskirt/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/tourist_1
display_name = "tourist outfit, white"
@@ -556,7 +556,7 @@
/datum/gear/uniform/leotardcolor/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
//skinsuits
/datum/gear/uniform/skinsuits
@@ -613,7 +613,7 @@
"cableknit sweater"=/obj/item/clothing/under/bigsweater,
"keyhole sweater"=/obj/item/clothing/under/bigsweater/keyhole
)
gear_tweaks += list(new/datum/gear_tweak/path(bigsweaters), gear_tweak_free_color_choice)
gear_tweaks += list(new/datum/gear_tweak/path(bigsweaters), GLOB.gear_tweak_free_color_choice)
//half-moon outfit
/datum/gear/uniform/halfmoon
@@ -659,7 +659,7 @@
"maid reverse bunnysuit, no legs"=/obj/item/clothing/under/reverse_bunnytop_maid
)
gear_tweaks += list(new/datum/gear_tweak/path(bunnysuit))
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/suit/permit
display_name = "nudity permit"
@@ -754,7 +754,7 @@ Qipao
/datum/gear/uniform/qipao_colorable_alt/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/*
Bluespace jumpsuit
@@ -852,7 +852,7 @@ Talon jumpsuit
"short skirt"=/obj/item/clothing/under/skirt/colorable/short,
"short skirt (split)"=/obj/item/clothing/under/skirt/colorable/short_split
)
gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)
gear_tweaks += list(new/datum/gear_tweak/path(skirts), GLOB.gear_tweak_free_color_choice)
// gwen beedells clown clothes
@@ -868,7 +868,7 @@ Talon jumpsuit
/datum/gear/uniform/cdress_fire/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
// recolorable yellow dress
/datum/gear/uniform/cbridesmaid
@@ -877,7 +877,7 @@ Talon jumpsuit
/datum/gear/uniform/cbridesmaid/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
// recolorable orange swoop dress
/datum/gear/uniform/cswoopdress
@@ -886,7 +886,7 @@ Talon jumpsuit
/datum/gear/uniform/cswoopdress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
// waiter's outfit, this should probably be in a selector with all the other service uniforms.
/datum/gear/uniform/waiter
code/modules/client/preference_setup/loadout/loadout_utility.dm
+2 -2
View File
@@ -129,7 +129,7 @@
/datum/gear/utility/umbrella/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/utility/wheelchair
display_name = "wheelchair selection"
@@ -138,7 +138,7 @@
/datum/gear/utility/wheelchair/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
var/list/wheelchairs = list(
"wheelchair" = /obj/item/wheelchair,
"motorized wheelchair" = /obj/item/wheelchair/motor
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+13 -13
View File
@@ -80,7 +80,7 @@
/datum/gear/ears/skrell/colored/band/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/ears/skrell/colored/chain
display_name = "Colored chain (Skrell)"
@@ -90,7 +90,7 @@
/datum/gear/ears/skrell/colored/chain/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/smock
display_name = "smock selection (Teshari)"
@@ -147,7 +147,7 @@
/datum/gear/shoes/footwraps/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/uniform/cohesionsuits
display_name = "cohesion suit selection (Promethean)"
@@ -524,7 +524,7 @@
/datum/gear/uniform/smockcolor/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/beltcloak
display_name = "belted cloak selection (Teshari)"
@@ -548,7 +548,7 @@
/datum/gear/suit/beltcloak_color/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/dept/beltcloak
whitelisted = SPECIES_TESHARI
@@ -610,7 +610,7 @@
/datum/gear/uniform/undercoatcolor/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/cloakcolor
display_name = "cloak, recolorable (Teshari)"
@@ -620,7 +620,7 @@
/datum/gear/suit/cloakcolor/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/labcoat_tesh
display_name = "labcoat, colorable (Teshari)"
@@ -630,7 +630,7 @@
/datum/gear/suit/labcoat_tesh/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/teshcoat
display_name = "small black coat, recolorable stripes (Teshari)"
@@ -640,7 +640,7 @@
/datum/gear/suit/teshcoat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/teshcoatwhite
display_name = "smallcoat, recolorable (Teshari)"
@@ -650,7 +650,7 @@
/datum/gear/suit/teshcoatwhite/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/accessory/teshneckscarf
display_name = "neckscarf, recolorable (Teshari)"
@@ -660,7 +660,7 @@
/datum/gear/accessory/teshneckscarf/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/shoes/toelessjack
display_name = "toe-less jackboots"
@@ -696,7 +696,7 @@
/datum/gear/shoes/teshwrap/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/////
@@ -846,7 +846,7 @@
/datum/gear/suit/taur/colorable_skirt/New()
..()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += GLOB.gear_tweak_free_color_choice
/datum/gear/suit/zaddat
sort_category = "Xenowear"