diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm new file mode 100644 index 0000000000..332095e049 --- /dev/null +++ b/code/__DEFINES/loadout.dm @@ -0,0 +1,56 @@ +//defines for loadout categories +//no category defines +#define NOCATEGORY list("NOCATEGORY") +#define NOSUBCATEGORY list("NOSUBCATEGORY") + + +//backpack +#define CATEGORY_BACKPACK "In backpack" +#define SUBCATEGORY_BACKPACK_GENERAL "General" //basically anything that there's not enough of to have its own subcategory +#define SUBCATEGORY_BACKPACK_TOYS "Toys" +//neck +#define CATEGORY_NECK "Neck" +#define SUBCATEGORY_NECK_GENERAL "General" +#define SUBCATEGORY_NECK_TIE "Ties" +#define SUBCATEGORY_NECK_SCARVES "Scarves" + +//mask +#define CATEGORY_MASK "Mask" + +//hands +#define CATEGORY_HANDS "Hands" + +//uniform +#define CATEGORY_UNIFORM "Uniform" //there's so many types of uniform it's best to have lots of categories +#define SUBCATEGORY_UNIFORM_GENERAL "General" +#define SUBCATEGORY_UNIFORM_JOBS "Jobs" +#define SUBCATEGORY_UNIFORM_SUITS "Suits" +#define SUBCATEGORY_UNIFORM_SKIRTS "Skirts" +#define SUBCATEGORY_UNIFORM_DRESSES "Dresses" +#define SUBCATEGORY_UNIFORM_SWEATERS "Sweaters" +#define SUBCATEGORY_UNIFORM_PANTS "Pants" +#define SUBCATEGORY_UNIFORM_SHORTS "Shorts" + +//suit +#define CATEGORY_SUIT "Suit" +#define SUBCATEGORY_SUIT_GENERAL "General" +#define SUBCATEGORY_SUIT_COATS "Coats" +#define SUBCATEGORY_SUIT_JACKETS "Jackets" +#define SUBCATEGORY_SUIT_JOBS "Jobs" + +//head +#define CATEGORY_HEAD "Head" +#define SUBCATEGORY_HEAD_GENERAL "General" +#define SUBCATEGORY_HEAD_JOBS "Jobs" + +//shoes +#define CATEGORY_SHOES "Shoes" + +//gloves +#define CATEGORY_GLOVES "Gloves" + +//glasses +#define CATEGORY_GLASSES "Glasses" + +//donator items +#define CATEGORY_DONATOR "Donator" diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm new file mode 100644 index 0000000000..2a44bf60f4 --- /dev/null +++ b/code/_globalvars/lists/loadout_categories.dm @@ -0,0 +1,13 @@ +GLOBAL_LIST_INIT(loadout_categories, list( + CATEGORY_BACKPACK = list(SUBCATEGORY_BACKPACK_GENERAL, SUBCATEGORY_BACKPACK_TOYS), + CATEGORY_NECK = list(SUBCATEGORY_NECK_GENERAL, SUBCATEGORY_NECK_TIE, SUBCATEGORY_NECK_SCARVES), + CATEGORY_MASK = NOSUBCATEGORY, + CATEGORY_HANDS = NOSUBCATEGORY, + CATEGORY_UNIFORM = list(SUBCATEGORY_UNIFORM_GENERAL, SUBCATEGORY_UNIFORM_JOBS, SUBCATEGORY_UNIFORM_SUITS, SUBCATEGORY_UNIFORM_SKIRTS, SUBCATEGORY_UNIFORM_DRESSES, SUBCATEGORY_UNIFORM_SWEATERS, SUBCATEGORY_UNIFORM_PANTS, SUBCATEGORY_UNIFORM_SHORTS), + CATEGORY_SUIT = list(SUBCATEGORY_SUIT_GENERAL, SUBCATEGORY_SUIT_COATS, SUBCATEGORY_SUIT_JACKETS, SUBCATEGORY_SUIT_JOBS), + CATEGORY_HEAD = list(SUBCATEGORY_HEAD_GENERAL, SUBCATEGORY_HEAD_JOBS), + CATEGORY_SHOES = NOSUBCATEGORY, + CATEGORY_GLOVES = NOSUBCATEGORY, + CATEGORY_GLASSES = NOSUBCATEGORY, + CATEGORY_DONATOR = NOSUBCATEGORY +)) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 4b2cf24f1e..4f59992ace 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -674,7 +674,7 @@ SUBSYSTEM_DEF(job) return for(var/i in the_mob.client.prefs.chosen_gear) var/datum/gear/G = i - G = GLOB.loadout_items[slot_to_string(initial(G.category))][initial(G.name)] + G = GLOB.loadout_items[initial(G.category)][initial(G.subcategory)][initial(G.name)] if(!G) continue var/permitted = TRUE @@ -682,14 +682,14 @@ SUBSYSTEM_DEF(job) permitted = FALSE if(G.donoritem && !G.donator_ckey_check(the_mob.client.ckey)) permitted = FALSE - if(!equipbackpackstuff && G.category == SLOT_IN_BACKPACK)//snowflake check since plopping stuff in the backpack doesnt work for pre-job equip loadout stuffs + if(!equipbackpackstuff && G.slot == SLOT_IN_BACKPACK)//snowflake check since plopping stuff in the backpack doesnt work for pre-job equip loadout stuffs permitted = FALSE - if(equipbackpackstuff && G.category != SLOT_IN_BACKPACK)//ditto + if(equipbackpackstuff && G.slot != SLOT_IN_BACKPACK)//ditto permitted = FALSE if(!permitted) continue var/obj/item/I = new G.path - if(!M.equip_to_slot_if_possible(I, G.category, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first + if(!M.equip_to_slot_if_possible(I, G.slot, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first if(iscarbon(M)) var/mob/living/carbon/C = M var/obj/item/storage/backpack/B = C.back diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 739a5fa243..3c9697c03a 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -40,7 +40,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) //If it's 0, that's good, if it's anything but 0, the owner of this prefs file's antag choices were, //autocorrected this round, not that you'd need to check that. - var/UI_style = null var/buttons_locked = FALSE var/hotkeys = FALSE @@ -1065,6 +1064,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
[gear_points] loadout points remaining. \[Clear Loadout\]
" dat += "
You can only choose one item per category, unless it's an item that spawns in your backpack or hands.
" dat += "
" + var/firstcat = TRUE for(var/i in GLOB.loadout_items) if(firstcat) @@ -1075,6 +1075,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += " [i] " else dat += " [i] " + dat += "
" dat += "
" dat += "
[gear_tab]
" diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 59d99674eb..dffab645a4 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -224,7 +224,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/needs_update = savefile_needs_update(S) if(needs_update == -2) //fatal, can't load any data return 0 - + . = TRUE //general preferences @@ -443,7 +443,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car return 0 . = TRUE - + //Species var/species_id S["species"] >> species_id diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 72d0f68c18..124ece8fdc 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -469,3 +469,16 @@ icon_state = "maid" item_state = "maid" dynamic_hair_suffix = "" + +/obj/item/clothing/head/widered + name = "Wide red hat" + desc = "It is both wide, and red. Stylish!" + icon_state = "widehat_red" + item_state = "widehat_red" + +/obj/item/clothing/head/kabuto + name = "Kabuto helmet" + desc = "A traditional kabuto helmet." + icon_state = "kabuto" + item_state = "kabuto" + flags_inv = HIDEHAIR|HIDEEARS diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 0b1121b22b..607a8ecb55 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1057,3 +1057,9 @@ desc = "Reminds you of someone, but you just can't put your finger on it..." icon_state = "waldo_shirt" item_state = "waldo_shirt" + +/obj/item/clothing/suit/samurai + name = "Samurai outfit" + desc = "An outfit used by traditional japanese warriors." + icon_state = "samurai" + item_state = "samurai" \ No newline at end of file diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 3e7bc755cb..18cd104ff8 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -329,3 +329,29 @@ desc = "cloud" icon_state = "cloud" can_adjust = FALSE + +/obj/item/clothing/under/costume/kimono + name = "Kimono" + desc = "A traditional piece of clothing from japan" + icon_state = "kimono" + item_state = "kimono" + +/obj/item/clothing/under/costume/kimono/black + name = "Black Kimono" + icon_state = "kimono_a" + item_state = "kimono_a" + +/obj/item/clothing/under/costume/kimono/kamishimo + name = "Kamishimo" + icon_state = "kamishimo" + item_state = "kamishimo" + +/obj/item/clothing/under/costume/kimono/fancy + name = "Fancy Kimono" + icon_state = "fancy_kimono" + item_state = "fancy_kimono" + +/obj/item/clothing/under/costume/kimono/sakura + name = "Sakura Kimono'" + icon_state = "sakura_kimono" + item_state = "sakura_kimono" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index bc38cb6664..27fb0cc00d 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -308,3 +308,21 @@ icon_state = "polyfemtankpantsu" poly_states = 2 poly_colors = list("#808080", "#FF3535") + +/obj/item/clothing/under/misc/black_dress + name = "little black dress" + desc = "A small black dress" + icon_state = "littleblackdress_s" + item_state = "littleblackdress_s" + +/obj/item/clothing/under/misc/pinktutu + name = "pink tutu" + desc = "A pink tutu" + icon_state = "pinktutu_s" + item_state = "pinktutu_s" + +/obj/item/clothing/under/misc/bathrobe + name = "bathrobe" + desc = "A blue bathrobe." + icon_state = "bathrobe" + item_state = "bathrobe" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index a6e75123bb..0ad9452994 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 7a690bb29f..c94e8a46d3 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi index 2616c0b893..dd00713770 100644 Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index fa376635f9..3d24a9addd 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index af72ac0e7b..bcb894033e 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 90f1fba315..60304999fa 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 258eb0dc35..e8a360bc87 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 57424c7b99..76f5722c8b 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index d428fc290a..54dabba779 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -1,496 +1,497 @@ //This is the file that handles donator loadout items. -/datum/gear/pingcoderfailsafe +/datum/gear/donator name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/bikehorn/golden + category = CATEGORY_DONATOR ckeywhitelist = list("This entry should never appear with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard -/datum/gear/donortestingbikehorn +/datum/gear/donator/donortestingbikehorn name = "Donor item testing bikehorn" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/bikehorn geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings -/datum/gear/kevhorn +/datum/gear/donator/kevhorn name = "Airhorn" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/bikehorn/airhorn ckeywhitelist = list("kevinz000") -/datum/gear/cebusoap +/datum/gear/donator/cebusoap name = "Cebutris' soap" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/custom/ceb_soap ckeywhitelist = list("cebutris") -/datum/gear/kiaracloak +/datum/gear/donator/kiaracloak name = "Kiara's cloak" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/cloak/inferno ckeywhitelist = list("inferno707") -/datum/gear/kiaracollar +/datum/gear/donator/kiaracollar name = "Kiara's collar" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/petcollar/inferno ckeywhitelist = list("inferno707") -/datum/gear/kiaramedal +/datum/gear/donator/kiaramedal name = "Insignia of Steele" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/clothing/accessory/medal/steele ckeywhitelist = list("inferno707") -/datum/gear/hheart +/datum/gear/donator/hheart name = "The Hollow Heart" - category = SLOT_WEAR_MASK + slot = SLOT_WEAR_MASK path = /obj/item/clothing/mask/hheart ckeywhitelist = list("inferno707") -/datum/gear/engravedzippo +/datum/gear/donator/engravedzippo name = "Engraved zippo" - category = SLOT_HANDS + slot = SLOT_HANDS path = /obj/item/lighter/gold ckeywhitelist = list("dirtyoldharry") -/datum/gear/geisha +/datum/gear/donator/geisha name = "Geisha suit" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/geisha ckeywhitelist = list("atiefling") -/datum/gear/specialscarf +/datum/gear/donator/specialscarf name = "Special scarf" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/scarf/zomb ckeywhitelist = list("zombierobin") -/datum/gear/redmadcoat +/datum/gear/donator/redmadcoat name = "The Mad's labcoat" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/toggle/labcoat/mad/red ckeywhitelist = list("zombierobin") -/datum/gear/santahat +/datum/gear/donator/santahat name = "Santa hat" - category = SLOT_HEAD + slot = SLOT_HEAD path = /obj/item/clothing/head/santa/fluff ckeywhitelist = list("illotafv") -/datum/gear/reindeerhat +/datum/gear/donator/reindeerhat name = "Reindeer hat" - category = SLOT_HEAD + slot = SLOT_HEAD path = /obj/item/clothing/head/hardhat/reindeer/fluff ckeywhitelist = list("illotafv") -/datum/gear/treeplushie +/datum/gear/donator/treeplushie name = "Christmas tree plushie" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/plush/tree ckeywhitelist = list("illotafv") -/datum/gear/santaoutfit +/datum/gear/donator/santaoutfit name = "Santa costume" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/space/santa/fluff ckeywhitelist = list("illotafv") -/datum/gear/treecloak +/datum/gear/donator/treecloak name = "Christmas tree cloak" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/cloak/festive ckeywhitelist = list("illotafv") -/datum/gear/carrotplush +/datum/gear/donator/carrotplush name = "Carrot plushie" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/plush/carrot ckeywhitelist = list("improvedname") -/datum/gear/carrotcloak +/datum/gear/donator/carrotcloak name = "Carrot cloak" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/cloak/carrot ckeywhitelist = list("improvedname") -/datum/gear/albortorosamask +/datum/gear/donator/albortorosamask name = "Alborto Rosa mask" - category = SLOT_WEAR_MASK + slot = SLOT_WEAR_MASK path = /obj/item/clothing/mask/luchador/zigfie ckeywhitelist = list("zigfie") -/datum/gear/mankini +/datum/gear/donator/mankini name = "Mankini" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/stripper/mankini ckeywhitelist = list("zigfie") -/datum/gear/pinkshoes +/datum/gear/donator/pinkshoes name = "Pink shoes" - category = SLOT_SHOES + slot = SLOT_SHOES path = /obj/item/clothing/shoes/sneakers/pink ckeywhitelist = list("zigfie") -/datum/gear/reecesgreatcoat +/datum/gear/donator/reecesgreatcoat name = "Reece's Great Coat" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/trenchcoat/green ckeywhitelist = list("geemiesif") -/datum/gear/russianflask +/datum/gear/donator/russianflask name = "Russian flask" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/reagent_containers/food/drinks/flask/russian cost = 2 ckeywhitelist = list("slomka") -/datum/gear/stalkermask +/datum/gear/donator/stalkermask name = "S.T.A.L.K.E.R. mask" - category = SLOT_WEAR_MASK + slot = SLOT_WEAR_MASK path = /obj/item/clothing/mask/gas/stalker ckeywhitelist = list("slomka") -/datum/gear/stripedcollar +/datum/gear/donator/stripedcollar name = "Striped collar" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/petcollar/stripe ckeywhitelist = list("jademanique") -/datum/gear/performersoutfit +/datum/gear/donator/performersoutfit name = "Bluish performer's outfit" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/singer/yellow/custom ckeywhitelist = list("killer402402") -/datum/gear/vermillion +/datum/gear/donator/vermillion name = "Vermillion clothing" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/suit/vermillion ckeywhitelist = list("fractious") -/datum/gear/AM4B +/datum/gear/donator/AM4B name = "Foam Force AM4-B" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/gun/ballistic/automatic/AM4B ckeywhitelist = list("zeronetalpha") -/datum/gear/carrotsatchel +/datum/gear/donator/carrotsatchel name = "Carrot Satchel" - category = SLOT_HANDS + slot = SLOT_HANDS path = /obj/item/storage/backpack/satchel/carrot ckeywhitelist = list("improvedname") -/datum/gear/naomisweater +/datum/gear/donator/naomisweater name = "worn black sweater" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/sweater/black/naomi ckeywhitelist = list("technicalmagi") -/datum/gear/naomicollar +/datum/gear/donator/naomicollar name = "worn pet collar" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/petcollar/naomi ckeywhitelist = list("technicalmagi") -/datum/gear/gladiator +/datum/gear/donator/gladiator name = "Gladiator Armor" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/under/costume/gladiator ckeywhitelist = list("aroche") -/datum/gear/bloodredtie +/datum/gear/donator/bloodredtie name = "Blood Red Tie" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/tie/bloodred ckeywhitelist = list("kyutness") -/datum/gear/puffydress +/datum/gear/donator/puffydress name = "Puffy Dress" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/puffydress ckeywhitelist = list("stallingratt") -/datum/gear/labredblack +/datum/gear/donator/labredblack name = "Black and Red Coat" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/toggle/labcoat/labredblack ckeywhitelist = list("blakeryan", "durandalphor") -/datum/gear/torisword +/datum/gear/donator/torisword name = "Rainbow Zweihander" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/dualsaber/hypereutactic/toy/rainbow ckeywhitelist = list("annoymous35") -/datum/gear/darksabre +/datum/gear/donator/darksabre name = "Dark Sabre" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/darksabre ckeywhitelist = list("inferno707") -datum/gear/darksabresheath +/datum/gear/donator/darksabresheath name = "Dark Sabre Sheath" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/storage/belt/sabre/darksabre ckeywhitelist = list("inferno707") -/datum/gear/toriball +/datum/gear/donator/toriball name = "Rainbow Tennis Ball" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/rainbow ckeywhitelist = list("annoymous35") -/datum/gear/izzyball +/datum/gear/donator/izzyball name = "Katlin's Ball" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/rainbow/izzy ckeywhitelist = list("izzyinbox") -/datum/gear/cloak +/datum/gear/donator/cloak name = "Green Cloak" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/cloak/green ckeywhitelist = list("killer402402") -/datum/gear/steelflask +/datum/gear/donator/steelflask name = "Steel Flask" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/reagent_containers/food/drinks/flask/steel cost = 2 ckeywhitelist = list("nik707") -/datum/gear/paperhat +/datum/gear/donator/paperhat name = "Paper Hat" - category = SLOT_HEAD + slot = SLOT_HEAD path = /obj/item/clothing/head/paperhat ckeywhitelist = list("kered2") -/datum/gear/cloakce +/datum/gear/donator/cloakce name = "Polychromic CE Cloak" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/clothing/neck/cloak/polychromic/polyce ckeywhitelist = list("worksbythesea", "blakeryan") -/datum/gear/ssk +/datum/gear/donator/ssk name = "Stun Sword Kit" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/ssword_kit ckeywhitelist = list("phillip458") -/datum/gear/techcoat +/datum/gear/donator/techcoat name = "Techomancers Labcoat" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat ckeywhitelist = list("wilchen") -/datum/gear/leechjar +/datum/gear/donator/leechjar name = "Jar of Leeches" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/custom/leechjar ckeywhitelist = list("sgtryder") -/datum/gear/darkarmor +/datum/gear/donator/darkarmor name = "Dark Armor" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/clothing/suit/armor/vest/darkcarapace ckeywhitelist = list("inferno707") -/datum/gear/devilwings +/datum/gear/donator/devilwings name = "Strange Wings" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/devilwings ckeywhitelist = list("kitsun") -/datum/gear/flagcape +/datum/gear/donator/flagcape name = "US Flag Cape" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/clothing/neck/flagcape ckeywhitelist = list("darnchacha") -/datum/gear/luckyjack +/datum/gear/donator/luckyjack name = "Lucky Jackboots" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/clothing/shoes/lucky ckeywhitelist = list("donaldtrumpthecommunist") -/datum/gear/raiqbawks +/datum/gear/donator/raiqbawks name = "Miami Boombox" - category = SLOT_HANDS + slot = SLOT_HANDS cost = 2 path = /obj/item/boombox/raiq ckeywhitelist = list("chefferz") -/datum/gear/m41 +/datum/gear/donator/m41 name = "Toy M41" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/gun/m41 ckeywhitelist = list("thalverscholen") -/datum/gear/Divine_robes +/datum/gear/donator/Divine_robes name = "Divine robes" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/custom/lunasune ckeywhitelist = list("invader4352") -/datum/gear/gothcoat +/datum/gear/donator/gothcoat name = "Goth Coat" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/gothcoat ckeywhitelist = list("norko") -/datum/gear/corgisuit +/datum/gear/donator/corgisuit name = "Corgi Suit" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/ian_costume ckeywhitelist = list("cathodetherobot") -/datum/gear/sharkcloth +/datum/gear/donator/sharkcloth name = "Leon's Skimpy Outfit" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/under/custom/leoskimpy ckeywhitelist = list("spectrosis") -/datum/gear/mimemask +/datum/gear/donator/mimemask name = "Mime Mask" - category = SLOT_WEAR_MASK + slot = SLOT_WEAR_MASK path = /obj/item/clothing/mask/gas/mime ckeywhitelist = list("pireamaineach") -/datum/gear/mimeoveralls +/datum/gear/donator/mimeoveralls name = "Mime's Overalls" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/under/custom/mimeoveralls ckeywhitelist = list("pireamaineach") -/datum/gear/soulneck +/datum/gear/donator/soulneck name = "Soul Necklace" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/undertale ckeywhitelist = list("twilightic") -/datum/gear/frenchberet +/datum/gear/donator/frenchberet name = "French Beret" - category = SLOT_HEAD + slot = SLOT_HEAD path = /obj/item/clothing/head/frenchberet ckeywhitelist = list("notazoltan") -/datum/gear/zuliecloak +/datum/gear/donator/zuliecloak name = "Project: Zul-E" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/cloak/zuliecloak ckeywhitelist = list("asky") -/datum/gear/blackredgold +/datum/gear/donator/blackredgold name = "Black, Red, and Gold Coat" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/blackredgold ckeywhitelist = list("ttbnc") -/datum/gear/fritzplush +/datum/gear/donator/fritzplush name = "Fritz Plushie" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/plush/mammal/dog/fritz ckeywhitelist = list("analwerewolf") -/datum/gear/kimono +/datum/gear/donator/kimono name = "Kimono" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/kimono ckeywhitelist = list("sfox63") -/datum/gear/commjacket +/datum/gear/donator/commjacket name = "Dusty Commisar's Cloak" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/commjacket ckeywhitelist = list("sadisticbatter") -/datum/gear/mw2_russian_para +/datum/gear/donator/mw2_russian_para name = "Russian Paratrooper Jumper" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/custom/mw2_russian_para ckeywhitelist = list("investigator77") -/datum/gear/longblackgloves +/datum/gear/donator/longblackgloves name = "Luna's Gauntlets" - category = SLOT_GLOVES + slot = SLOT_GLOVES path = /obj/item/clothing/gloves/longblackgloves ckeywhitelist = list("bigmanclancy") -/datum/gear/trendy_fit +/datum/gear/donator/trendy_fit name = "Trendy Fit" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/custom/trendy_fit ckeywhitelist = list("midgetdragon") -/datum/gear/singery +/datum/gear/donator/singery name = "Yellow Performer Outfit" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/singer/yellow ckeywhitelist = list("maxlynchy") -/datum/gear/csheet +/datum/gear/donator/csheet name = "NT Bedsheet" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/bedsheet/captain ckeywhitelist = list("tikibomb") -/datum/gear/borgplush +/datum/gear/donator/borgplush name = "Robot Plush" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/toy/plush/borgplushie ckeywhitelist = list("nicholaiavenicci") -/datum/gear/donorberet +/datum/gear/donator/donorberet name = "Atmos Beret" - category = SLOT_HEAD + slot = SLOT_HEAD path = /obj/item/clothing/head/blueberet ckeywhitelist = list("foxystalin") -/datum/gear/donorgoggles +/datum/gear/donator/donorgoggles name = "Flight Goggles" - category = SLOT_HEAD + slot = SLOT_HEAD path = /obj/item/clothing/head/flight ckeywhitelist = list("maxlynchy") -/datum/gear/onionneck +/datum/gear/donator/onionneck name = "Onion Necklace" - category = SLOT_NECK + slot = SLOT_NECK path = /obj/item/clothing/neck/necklace/onion ckeywhitelist = list("cdrcross") -/datum/gear/mikubikini +/datum/gear/donator/mikubikini name = "starlight singer bikini" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/under/custom/mikubikini ckeywhitelist = list("grandvegeta") -/datum/gear/mikujacket +/datum/gear/donator/mikujacket name = "starlight singer jacket" - category = SLOT_WEAR_SUIT + slot = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/mikujacket ckeywhitelist = list("grandvegeta") -/datum/gear/mikuhair +/datum/gear/donator/mikuhair name = "starlight singer hair" - category = SLOT_W_UNIFORM + slot = SLOT_W_UNIFORM path = /obj/item/clothing/head/mikuhair ckeywhitelist = list("grandvegeta") -/datum/gear/mikugloves +/datum/gear/donator/mikugloves name = "starlight singer gloves" - category = SLOT_GLOVES + slot = SLOT_GLOVES path = /obj/item/clothing/gloves/mikugloves ckeywhitelist = list("grandvegeta") -/datum/gear/mikuleggings +/datum/gear/donator/mikuleggings name = "starlight singer leggings" - category = SLOT_SHOES + slot = SLOT_SHOES path = /obj/item/clothing/shoes/sneakers/mikuleggings ckeywhitelist = list("grandvegeta") -/datum/gear/cosmos +/datum/gear/donator/cosmos name = "cosmic space bedsheet" - category = SLOT_IN_BACKPACK + slot = SLOT_IN_BACKPACK path = /obj/item/bedsheet/cosmos ckeywhitelist = list("grunnyyy") diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm index 51256f8cde..9988519471 100644 --- a/modular_citadel/code/modules/client/loadout/_loadout.dm +++ b/modular_citadel/code/modules/client/loadout/_loadout.dm @@ -28,7 +28,9 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) load_loadout_config() for(var/item in subtypesof(/datum/gear)) var/datum/gear/I = new item - LAZYSET(GLOB.loadout_items[slot_to_string(I.category)], I.name, I) + LAZYINITLIST(GLOB.loadout_items[I.category]) + LAZYINITLIST(GLOB.loadout_items[I.category][I.subcategory]) + GLOB.loadout_items[I.category][I.subcategory][I.name] = I if(islist(I.geargroupID)) var/list/ggidlist = I.geargroupID I.ckeywhitelist = list() @@ -41,7 +43,9 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) /datum/gear var/name - var/category + var/category = "NOCATEGORY" + var/subcategory = "NOSUBCATEGORY" + var/slot var/description var/path //item-to-spawn path var/cost = 1 //normally, each loadout costs a single point. diff --git a/modular_citadel/code/modules/client/loadout/_medical.dm b/modular_citadel/code/modules/client/loadout/_medical.dm index 604a0f96ae..bba100faff 100644 --- a/modular_citadel/code/modules/client/loadout/_medical.dm +++ b/modular_citadel/code/modules/client/loadout/_medical.dm @@ -1,47 +1,45 @@ -/datum/gear/medicbriefcase +/datum/gear/hands/medicbriefcase name = "Medical Briefcase" - category = SLOT_HANDS path = /obj/item/storage/briefcase/medical restricted_roles = list("Medical Doctor", "Chief Medical Officer") restricted_desc = "MD, CMO" -/datum/gear/stethoscope +/datum/gear/neck/stethoscope name = "Stethoscope" - category = SLOT_NECK path = /obj/item/clothing/neck/stethoscope restricted_roles = list("Medical Doctor", "Chief Medical Officer") -/datum/gear/bluescrubs +/datum/gear/uniform/bluescrubs name = "Blue Scrubs" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/medical/doctor/blue restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") restricted_desc = "Medical" - -/datum/gear/greenscrubs + +/datum/gear/uniform/greenscrubs name = "Green Scrubs" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/medical/doctor/green restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") restricted_desc = "Medical" -/datum/gear/purplescrubs +/datum/gear/uniform/purplescrubs name = "Purple Scrubs" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/medical/doctor/purple restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") restricted_desc = "Medical" -/datum/gear/nursehat +/datum/gear/head/nursehat name = "Nurse Hat" - category = SLOT_HEAD path = /obj/item/clothing/head/nursehat + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") restricted_desc = "Medical" -/datum/gear/nursesuit +/datum/gear/uniform/nursesuit name = "Nurse Suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/medical/doctor/nurse + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") - restricted_desc = "Medical" \ No newline at end of file + restricted_desc = "Medical" diff --git a/modular_citadel/code/modules/client/loadout/_security.dm b/modular_citadel/code/modules/client/loadout/_security.dm index 72a6aab394..3ec39008c1 100644 --- a/modular_citadel/code/modules/client/loadout/_security.dm +++ b/modular_citadel/code/modules/client/loadout/_security.dm @@ -1,71 +1,70 @@ -/datum/gear/navyblueuniformhos +/datum/gear/uniform/navyblueuniformhos name = "Head of Security navyblue uniform" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/security/head_of_security/formal restricted_roles = list("Head of Security") -/datum/gear/navybluehosberet +/datum/gear/head/navybluehosberet name = "Head of security's navyblue beret" - category = SLOT_HEAD path = /obj/item/clothing/head/beret/sec/navyhos + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Head of Security") -/datum/gear/navybluejackethos +/datum/gear/suit/navybluejackethos name = "head of security's navyblue jacket" - category = SLOT_WEAR_SUIT + subcategory = SUBCATEGORY_SUIT_JOBS path = /obj/item/clothing/suit/armor/hos/navyblue restricted_roles = list("Head of Security") -/datum/gear/navybluejacketofficer +/datum/gear/suit/navybluejacketofficer name = "security officer's navyblue jacket" - category = SLOT_WEAR_SUIT + subcategory = SUBCATEGORY_SUIT_JOBS path = /obj/item/clothing/suit/armor/navyblue restricted_roles = list("Security Officer") -/datum/gear/navyblueofficerberet +/datum/gear/head/navyblueofficerberet name = "Security officer's Navyblue beret" - category = SLOT_HEAD path = /obj/item/clothing/head/beret/sec/navyofficer + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Security Officer") -/datum/gear/navyblueuniformofficer +/datum/gear/uniform/navyblueuniformofficer name = "Security officer navyblue uniform" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/security/officer/formal restricted_roles = list("Security Officer") -/datum/gear/navybluejacketwarden +/datum/gear/suit/navybluejacketwarden name = "warden navyblue jacket" - category = SLOT_WEAR_SUIT + subcategory = SUBCATEGORY_SUIT_JOBS path = /obj/item/clothing/suit/armor/vest/warden/navyblue restricted_roles = list("Warden") -/datum/gear/navybluewardenberet +/datum/gear/head/navybluewardenberet name = "Warden's navyblue beret" - category = SLOT_HEAD path = /obj/item/clothing/head/beret/sec/navywarden + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Warden") -/datum/gear/navyblueuniformwarden +/datum/gear/uniform/navyblueuniformwarden name = "Warden navyblue uniform" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/security/warden/formal restricted_roles = list("Warden") -/datum/gear/secskirt +/datum/gear/uniform/secskirt name = "Security skirt" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/security/officer/skirt restricted_roles = list("Security Officer", "Warden", "Head of Security") -/datum/gear/hosskirt +/datum/gear/uniform/hosskirt name = "Head of security's skirt" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/rank/security/head_of_security/skirt restricted_roles = list("Head of Security") -/datum/gear/sechud +/datum/gear/glasses/sechud name = "Security Hud" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/hud/security restricted_roles = list("Security Officer", "Warden", "Head of Security") \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm index ab3daa5f3c..8949c04604 100644 --- a/modular_citadel/code/modules/client/loadout/_service.dm +++ b/modular_citadel/code/modules/client/loadout/_service.dm @@ -1,33 +1,33 @@ -/datum/gear/greytidestationwide +/datum/gear/uniform/greytidestationwide name = "Staff Assistant's jumpsuit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/staffassistant + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Assistant") -/datum/gear/neetsuit +/datum/gear/suit/neetsuit name = "D.A.B. suit" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/assu_suit + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Assistant") cost = 2 -/datum/gear/neethelm +/datum/gear/head/neethelm name = "D.A.B. helmet" - category = SLOT_HEAD path = /obj/item/clothing/head/assu_helmet + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Assistant") cost = 2 -/datum/gear/plushvar +/datum/gear/backpack/plushvar name = "Ratvar Plushie" - category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/plushvar + subcategory = SUBCATEGORY_BACKPACK_TOYS cost = 5 restricted_roles = list("Chaplain") -/datum/gear/narplush +/datum/gear/backpack/narplush name = "Narsie Plushie" - category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/narplush + subcategory = SUBCATEGORY_BACKPACK_TOYS cost = 5 restricted_roles = list("Chaplain") diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 690e012840..fe308f5b23 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -1,112 +1,100 @@ -/datum/gear/plushbox +/datum/gear/backpack + category = CATEGORY_BACKPACK + subcategory = SUBCATEGORY_BACKPACK_GENERAL + slot = SLOT_IN_BACKPACK + +/datum/gear/backpack/plushbox name = "Plushie Choice Box" - category = SLOT_IN_BACKPACK path = /obj/item/choice_beacon/box/plushie + subcategory = SUBCATEGORY_BACKPACK_TOYS -/datum/gear/tennis +/datum/gear/backpack/tennis name = "Classic Tennis Ball" - category = SLOT_IN_BACKPACK path = /obj/item/toy/tennis + subcategory = SUBCATEGORY_BACKPACK_TOYS -/datum/gear/tennisred +/datum/gear/backpack/tennis/red name = "Red Tennis Ball" - category = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/red -/datum/gear/tennisyellow +/datum/gear/backpack/tennis/yellow name = "Yellow Tennis Ball" - category = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/yellow -/datum/gear/tennisgreen +/datum/gear/backpack/tennis/green name = "Green Tennis Ball" - category = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/green -/datum/gear/tenniscyan +/datum/gear/backpack/tennis/cyan name = "Cyan Tennis Ball" - category = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/cyan -/datum/gear/tennisblue +/datum/gear/backpack/tennis/blue name = "Blue Tennis Ball" - category = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/blue -/datum/gear/tennispurple +/datum/gear/backpack/tennis/purple name = "Purple Tennis Ball" - category = SLOT_IN_BACKPACK path = /obj/item/toy/tennis/purple -/datum/gear/dildo +/datum/gear/backpack/dildo name = "Customizable dildo" - category = SLOT_IN_BACKPACK path = /obj/item/dildo/custom + subcategory = SUBCATEGORY_BACKPACK_TOYS -/datum/gear/toykatana +/datum/gear/backpack/toykatana name = "Toy Katana" - category = SLOT_IN_BACKPACK path = /obj/item/toy/katana + subcategory = SUBCATEGORY_BACKPACK_TOYS cost = 3 -/datum/gear/tapeplayer +/datum/gear/backpack/tapeplayer name = "Taperecorder" - category = SLOT_IN_BACKPACK path = /obj/item/taperecorder -/datum/gear/tape +/datum/gear/backpack/tape name = "Spare cassette tape" - category = SLOT_IN_BACKPACK path = /obj/item/tape/random -/datum/gear/newspaper +/datum/gear/backpack/newspaper name = "Newspaper" - category = SLOT_IN_BACKPACK path = /obj/item/newspaper -/datum/gear/crayons +/datum/gear/backpack/crayons name = "Box of crayons" - category = SLOT_IN_BACKPACK path = /obj/item/storage/crayons + subcategory = SUBCATEGORY_BACKPACK_TOYS -/datum/gear/multipen +/datum/gear/backpack/multipen name = "A multicolored pen" - category = SLOT_IN_BACKPACK path = /obj/item/pen/fourcolor -/datum/gear/fountainpen +/datum/gear/backpack/fountainpen name = "A fancy pen" - category = SLOT_IN_BACKPACK path = /obj/item/pen/fountain cost = 2 -/datum/gear/modular_tablet +/datum/gear/backpack/modular_tablet name = "A modular tablet" - category = SLOT_IN_BACKPACK path = /obj/item/modular_computer/tablet/preset/cheap/ cost = 4 -/datum/gear/modular_laptop +/datum/gear/backpack/modular_laptop name = "A modular laptop" - category = SLOT_IN_BACKPACK path = /obj/item/modular_computer/laptop/preset/civilian cost = 7 -/datum/gear/ringbox_gold +/datum/gear/backpack/ringbox_gold name = "A gold ring box" - category = SLOT_IN_BACKPACK path = /obj/item/storage/fancy/ringbox cost = 3 -/datum/gear/ringbox_silver +/datum/gear/backpack/ringbox_silver name = "A silver ring box" - category = SLOT_IN_BACKPACK path = /obj/item/storage/fancy/ringbox/silver cost = 3 -/datum/gear/ringbox_diamond +/datum/gear/backpack/ringbox_diamond name = "A diamond ring box" - category = SLOT_IN_BACKPACK path = /obj/item/storage/fancy/ringbox/diamond cost = 5 - diff --git a/modular_citadel/code/modules/client/loadout/glasses.dm b/modular_citadel/code/modules/client/loadout/glasses.dm index 57270d8e57..65bb7ad23c 100644 --- a/modular_citadel/code/modules/client/loadout/glasses.dm +++ b/modular_citadel/code/modules/client/loadout/glasses.dm @@ -1,49 +1,43 @@ -/datum/gear/blindfold +/datum/gear/glasses + category = CATEGORY_GLASSES + slot = SLOT_GLASSES + +/datum/gear/glasses/blindfold name = "Blindfold" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/sunglasses/blindfold -/datum/gear/cold +/datum/gear/glasses/cold name = "Cold goggles" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/cold -/datum/gear/eyepatch +/datum/gear/glasses/eyepatch name = "Eyepatch" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/eyepatch -/datum/gear/heat +/datum/gear/glasses/heat name = "Heat goggles" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/heat -/datum/gear/hipster +/datum/gear/glasses/hipster name = "Hipster glasses" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/regular/hipster -/datum/gear/jamjar +/datum/gear/glasses/jamjar name = "Jamjar glasses" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/regular/jamjar -/datum/gear/monocle +/datum/gear/glasses/monocle name = "Monocle" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/monocle -/datum/gear/orange +/datum/gear/glasses/orange name = "Orange glasses" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/orange -/datum/gear/red +/datum/gear/glasses/red name = "Red Glasses" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/red -/datum/gear/prescription +/datum/gear/glasses/prescription name = "Prescription glasses" - category = SLOT_GLASSES path = /obj/item/clothing/glasses/regular diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index e9e8e3939b..43323af43c 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -1,28 +1,26 @@ -/datum/gear/fingerless +/datum/gear/gloves + category = CATEGORY_GLOVES + slot = SLOT_GLOVES + +/datum/gear/gloves/fingerless name = "Fingerless Gloves" - category = SLOT_GLOVES path = /obj/item/clothing/gloves/fingerless -/datum/gear/evening +/datum/gear/gloves/evening name = "Evening gloves" - category = SLOT_GLOVES path = /obj/item/clothing/gloves/evening -/datum/gear/goldring +/datum/gear/gloves/goldring name = "A gold ring" - category = SLOT_GLOVES path = /obj/item/clothing/gloves/ring cost = 2 -/datum/gear/silverring +/datum/gear/gloves/silverring name = "A silver ring" - category = SLOT_GLOVES path = /obj/item/clothing/gloves/ring/silver cost = 2 -/datum/gear/diamondring +/datum/gear/gloves/diamondring name = "A diamond ring" - category = SLOT_GLOVES path = /obj/item/clothing/gloves/ring/diamond cost = 4 - diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index 2f03bd3b07..ff4827e6bc 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -1,67 +1,54 @@ -/datum/gear/cane +/datum/gear/hands + category = CATEGORY_HANDS + slot = SLOT_HANDS + +/datum/gear/hands/cane name = "Cane" - category = SLOT_HANDS path = /obj/item/cane -/datum/gear/cigarettes +/datum/gear/hands/cigarettes name = "Cigarette pack" - category = SLOT_HANDS path = /obj/item/storage/fancy/cigarettes -/datum/gear/dice +/datum/gear/hands/dice name = "Dice bag" - category = SLOT_HANDS path = /obj/item/storage/box/dice -/datum/gear/eightball +/datum/gear/hands/eightball name = "Magic eightball" - category = SLOT_HANDS path = /obj/item/toy/eightball -/datum/gear/matches +/datum/gear/hands/matches name = "Matchbox" - category = SLOT_HANDS path = /obj/item/storage/box/matches -/datum/gear/cheaplighter +/datum/gear/hands/cheaplighter name = "Cheap lighter" - category = SLOT_HANDS path = /obj/item/lighter/greyscale -/datum/gear/cards +/datum/gear/hands/cards name = "Playing cards" - category = SLOT_HANDS path = /obj/item/toy/cards/deck -/datum/gear/skub +/datum/gear/hands/skub name = "Skub" - category = SLOT_HANDS path = /obj/item/skub -/datum/gear/carpplushie - name = "Space carp plushie" - category = SLOT_HANDS - path = /obj/item/toy/plush/carpplushie - -/datum/gear/wallet +/datum/gear/hands/wallet name = "Wallet" - category = SLOT_HANDS path = /obj/item/storage/wallet -/datum/gear/flask +/datum/gear/hands/flask name = "Flask" - category = SLOT_HANDS path = /obj/item/reagent_containers/food/drinks/flask cost = 2 -/datum/gear/zippolighter +/datum/gear/hands/zippolighter name = "Zippo Lighter" - category = SLOT_HANDS path = /obj/item/lighter cost = 2 -/datum/gear/cigar +/datum/gear/hands/cigar name = "Cigar" - category = SLOT_HANDS path = /obj/item/clothing/mask/cigarette/cigar cost = 4 //smoking is bad mkay diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 2156c9c481..a1495aa7bd 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -1,146 +1,136 @@ -/datum/gear/baseball +/datum/gear/head + category = CATEGORY_HEAD + subcategory = SUBCATEGORY_HEAD_GENERAL + slot = SLOT_HEAD + +/datum/gear/head/baseball name = "Ballcap" - category = SLOT_HEAD path = /obj/item/clothing/head/soft/mime -/datum/gear/beanie +/datum/gear/head/beanie name = "Beanie" - category = SLOT_HEAD path = /obj/item/clothing/head/beanie -/datum/gear/beret +/datum/gear/head/beret name = "Black beret" - category = SLOT_HEAD path = /obj/item/clothing/head/beret/black -/datum/gear/flatcap +/datum/gear/head/flatcap name = "Flat cap" - category = SLOT_HEAD path = /obj/item/clothing/head/flatcap -/datum/gear/pirate +/datum/gear/head/pirate name = "Pirate hat" - category = SLOT_HEAD path = /obj/item/clothing/head/pirate -/datum/gear/rice_hat +/datum/gear/head/rice_hat name = "Rice hat" - category = SLOT_HEAD path = /obj/item/clothing/head/rice_hat -/datum/gear/ushanka - name = "Ushanka" - category = SLOT_HEAD +/datum/gear/head/ushanka path = /obj/item/clothing/head/ushanka -/datum/gear/slime +/datum/gear/head/slime name = "Slime hat" - category = SLOT_HEAD path = /obj/item/clothing/head/collectable/slime -/datum/gear/fedora +/datum/gear/head/fedora name = "Fedora" - category = SLOT_HEAD path = /obj/item/clothing/head/fedora -/datum/gear/that +/datum/gear/head/that name = "Top Hat" - category = SLOT_HEAD path = /obj/item/clothing/head/that -/datum/gear/maidband +/datum/gear/head/maidband name = "Maid headband" - category = SLOT_HEAD path= /obj/item/clothing/head/maid -/datum/gear/flakhelm +/datum/gear/head/flakhelm name = "Flak Helmet" - category = SLOT_HEAD path = /obj/item/clothing/head/flakhelm cost = 2 -/datum/gear/bunnyears +/datum/gear/head/bunnyears name = "Bunny Ears" - category = SLOT_HEAD path = /obj/item/clothing/head/rabbitears -/datum/gear/mailmanhat +/datum/gear/head/mailmanhat name = "Mailman's Hat" - category = SLOT_HEAD path = /obj/item/clothing/head/mailman //trek fancy Hats! -/datum/gear/trekcap +/datum/gear/head/trekcap name = "Federation Officer's Cap (White)" - category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Captain","Head of Personnel") -/datum/gear/trekcapcap +/datum/gear/head/trekcapcap name = "Federation Officer's Cap (Black)" - category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/black + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Captain","Head of Personnel") -/datum/gear/trekcapmedisci +/datum/gear/head/trekcapmedisci name = "Federation Officer's Cap (Blue)" - category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/medsci + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekcapeng +/datum/gear/head/trekcapeng name = "Federation Officer's Cap (Yellow)" - category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/eng + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") -/datum/gear/trekcapsec +/datum/gear/head/trekcapsec name = "Federation Officer's Cap (Red)" - category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/sec + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") // orvilike "original" kepi -/datum/gear/orvkepicom +/datum/gear/head/orvkepicom name = "Federation Kepi, command" description = "A visored cap. Intended to be used with ORV uniform." - category = SLOT_HEAD path = /obj/item/clothing/head/kepi/orvi/command + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") -/datum/gear/orvkepiops +/datum/gear/head/orvkepiops name = "Federation Kepi, ops/sec" description = "A visored cap. Intended to be used with ORV uniform." - category = SLOT_HEAD path = /obj/item/clothing/head/kepi/orvi/engsec + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Engineering, Security and Cargo" restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster") -/datum/gear/orvkepimedsci +/datum/gear/head/orvkepimedsci name = "Federation Kepi, medsci" description = "A visored cap. Intended to be used with ORV uniform." - category = SLOT_HEAD path = /obj/item/clothing/head/kepi/orvi/medsci + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist") -/datum/gear/orvkepisrv +/datum/gear/head/orvkepisrv name = "Federation Kepi, service" description = "A visored cap. Intended to be used with ORV uniform." - category = SLOT_HEAD path = /obj/item/clothing/head/kepi/orvi/service + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer" restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain") -/datum/gear/orvkepiass +/datum/gear/head/orvkepiass name = "Federation Kepi, assistant" description = "A visored cap. Intended to be used with ORV uniform." - category = SLOT_HEAD path = /obj/item/clothing/head/kepi/orvi + subcategory = SUBCATEGORY_HEAD_JOBS restricted_roles = list("Assistant") /*Commenting out Until next Christmas or made automatic @@ -156,35 +146,37 @@ */ //Cowboy Stuff -/datum/gear/cowboyhat +/datum/gear/head/cowboyhat name = "Cowboy Hat, Brown" - category = SLOT_HEAD path = /obj/item/clothing/head/cowboyhat -/datum/gear/cowboyhat/black +/datum/gear/head/cowboyhat/black name = "Cowboy Hat, Black" - category = SLOT_HEAD path = /obj/item/clothing/head/cowboyhat/black -/datum/gear/cowboyhat/white +/datum/gear/head/cowboyhat/white name = "Cowboy Hat, White" - category = SLOT_HEAD path = /obj/item/clothing/head/cowboyhat/white -/datum/gear/cowboyhat/pink +/datum/gear/head/cowboyhat/pink name = "Cowboy Hat, Pink" - category = SLOT_HEAD path = /obj/item/clothing/head/cowboyhat/pink -/datum/gear/cowboyhat/sec +/datum/gear/head/cowboyhat/sec name = "Cowboy Hat, Security" - category = SLOT_HEAD path = /obj/item/clothing/head/cowboyhat/sec + subcategory = SUBCATEGORY_HEAD_JOBS restricted_desc = "Security" restricted_roles = list("Warden","Detective","Security Officer","Head of Security") -// Misc -/datum/gear/wkepi +/datum/gear/head/wkepi name = "white kepi" - category = SLOT_HEAD path = /obj/item/clothing/head/kepi + +/datum/gear/head/widered + name = "Wide red hat" + path = /obj/item/clothing/head/widered + +/datum/gear/head/kabuto + name = "Kabuto helmet" + path = /obj/item/clothing/head/kabuto diff --git a/modular_citadel/code/modules/client/loadout/mask.dm b/modular_citadel/code/modules/client/loadout/mask.dm index eeba06cad4..ec77eba93c 100644 --- a/modular_citadel/code/modules/client/loadout/mask.dm +++ b/modular_citadel/code/modules/client/loadout/mask.dm @@ -1,16 +1,16 @@ -/datum/gear/balaclava +/datum/gear/mask + category = CATEGORY_MASK + slot = SLOT_WEAR_MASK + +/datum/gear/mask/balaclava name = "Balaclava" - category = SLOT_WEAR_MASK path = /obj/item/clothing/mask/balaclava -/datum/gear/moustache +/datum/gear/mask/moustache name = "Fake moustache" - category = SLOT_WEAR_MASK path = /obj/item/clothing/mask/fakemoustache -/datum/gear/joy +/datum/gear/mask/joy name = "Joy mask" - category = SLOT_WEAR_MASK path = /obj/item/clothing/mask/joy cost = 3 - diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm index 0f69296406..2e8ec7001d 100644 --- a/modular_citadel/code/modules/client/loadout/neck.dm +++ b/modular_citadel/code/modules/client/loadout/neck.dm @@ -1,99 +1,88 @@ -/datum/gear/bluetie +/datum/gear/neck + category = CATEGORY_NECK + subcategory = SUBCATEGORY_NECK_GENERAL + slot = SLOT_NECK + +/datum/gear/neck/bluetie name = "Blue tie" - category = SLOT_NECK + subcategory = SUBCATEGORY_NECK_TIE path = /obj/item/clothing/neck/tie/blue -/datum/gear/redtie +/datum/gear/neck/redtie name = "Red tie" - category = SLOT_NECK + subcategory = SUBCATEGORY_NECK_TIE path = /obj/item/clothing/neck/tie/red -/datum/gear/blacktie +/datum/gear/neck/blacktie name = "Black tie" - category = SLOT_NECK + subcategory = SUBCATEGORY_NECK_TIE path = /obj/item/clothing/neck/tie/black -/datum/gear/collar +/datum/gear/neck/collar name = "Collar" - category = SLOT_NECK path = /obj/item/clothing/neck/petcollar -/datum/gear/leathercollar +/datum/gear/neck/leathercollar name = "Leather collar" - category = SLOT_NECK path = /obj/item/clothing/neck/petcollar/leather -/datum/gear/choker +/datum/gear/neck/choker name = "Choker" - category = SLOT_NECK path = /obj/item/clothing/neck/petcollar/choker -/datum/gear/scarf +/datum/gear/neck/scarf name = "White scarf" - category = SLOT_NECK + subcategory = SUBCATEGORY_NECK_SCARVES path = /obj/item/clothing/neck/scarf -/datum/gear/blackscarf +/datum/gear/neck/scarf/black name = "Black scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/black -/datum/gear/redscarf +/datum/gear/neck/scarf/red name = "Red scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/red -/datum/gear/greenscarf +/datum/gear/neck/scarf/green name = "Green scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/green -/datum/gear/darkbluescarf +/datum/gear/neck/scarf/darkblue name = "Dark blue scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/darkblue -/datum/gear/purplescarf +/datum/gear/neck/scarf/purple name = "Purple scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/purple -/datum/gear/yellowscarf +/datum/gear/neck/scarf/yellow name = "Yellow scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/yellow -/datum/gear/orangescarf +/datum/gear/neck/scarf/orange name = "Orange scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/orange -/datum/gear/cyanscarf +/datum/gear/neck/scarf/cyan name = "Cyan scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/scarf/cyan -/datum/gear/stripedredscarf +/datum/gear/neck/scarf/stripedred name = "Striped red scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/stripedredscarf -/datum/gear/stripedbluescarf +/datum/gear/neck/scarf/stripedblue name = "Striped blue scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/stripedbluescarf -/datum/gear/stripedgreenscarf +/datum/gear/neck/scarf/stripedgreen name = "Striped green scarf" - category = SLOT_NECK path = /obj/item/clothing/neck/stripedgreenscarf -/datum/gear/headphones +/datum/gear/neck/headphones name = "Headphones" - category = SLOT_NECK path = /obj/item/clothing/ears/headphones -/datum/gear/polycloak +/datum/gear/neck/polycloak name = "Polychromatic Cloak" - category = SLOT_NECK path = /obj/item/clothing/neck/cloak/polychromic diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm index 3531e69cfd..f92ccbe17c 100644 --- a/modular_citadel/code/modules/client/loadout/shoes.dm +++ b/modular_citadel/code/modules/client/loadout/shoes.dm @@ -1,84 +1,71 @@ -/datum/gear/laceup +/datum/gear/shoes + category = CATEGORY_SHOES + slot = SLOT_SHOES + +/datum/gear/shoes/laceup name = "Laceup shoes" - category = SLOT_SHOES path = /obj/item/clothing/shoes/laceup -/datum/gear/workboots +/datum/gear/shoes/workboots name = "Work boots" - category = SLOT_SHOES path = /obj/item/clothing/shoes/workboots -/datum/gear/jackboots +/datum/gear/shoes/jackboots name = "Jackboots" - category = SLOT_SHOES path = /obj/item/clothing/shoes/jackboots -/datum/gear/winterboots +/datum/gear/shoes/winterboots name = "Winter boots" - category = SLOT_SHOES path = /obj/item/clothing/shoes/winterboots -/datum/gear/sandals +/datum/gear/shoes/sandals name = "Sandals" - category = SLOT_SHOES path = /obj/item/clothing/shoes/sandal -/datum/gear/blackshoes +/datum/gear/shoes/blackshoes name = "Black shoes" - category = SLOT_SHOES path = /obj/item/clothing/shoes/sneakers/black -/datum/gear/brownshoes +/datum/gear/shoes/brownshoes name = "Brown shoes" - category = SLOT_SHOES path = /obj/item/clothing/shoes/sneakers/brown -/datum/gear/whiteshoes +/datum/gear/shoes/whiteshoes name = "White shoes" - category = SLOT_SHOES path = /obj/item/clothing/shoes/sneakers/white -/datum/gear/gildedcuffs +/datum/gear/shoes/gildedcuffs name = "Gilded leg wraps" - category = SLOT_SHOES path= /obj/item/clothing/shoes/wraps -/datum/gear/silvercuffs +/datum/gear/shoes/silvercuffs name = "Silver leg wraps" - category = SLOT_SHOES path= /obj/item/clothing/shoes/wraps/silver -/datum/gear/redcuffs +/datum/gear/shoes/redcuffs name = "Red leg wraps" - category = SLOT_SHOES path= /obj/item/clothing/shoes/wraps/red -/datum/gear/bluecuffs +/datum/gear/shoes/bluecuffs name = "Blue leg wraps" - category = SLOT_SHOES path= /obj/item/clothing/shoes/wraps/blue -/datum/gear/christmasbootsr +/datum/gear/shoes/christmasbootsr name = "Red Christmas Boots" - category = SLOT_SHOES path= /obj/item/clothing/shoes/winterboots/christmasbootsr -/datum/gear/christmasbootsg +/datum/gear/shoes/christmasbootsg name = "Green Christmas Boots" - category = SLOT_SHOES path= /obj/item/clothing/shoes/winterboots/christmasbootsg -/datum/gear/santaboots +/datum/gear/shoes/santaboots name = "Santa Boots" - category = SLOT_SHOES path= /obj/item/clothing/shoes/winterboots/santaboots -/datum/gear/cowboyboots +/datum/gear/shoes/cowboyboots name = "Cowboy Boots, Brown" - category = SLOT_SHOES path = /obj/item/clothing/shoes/cowboyboots -/datum/gear/cowboyboots/black +/datum/gear/shoes/cowboyboots/black name = "Cowboy Boots, Black" - category = SLOT_SHOES - path = /obj/item/clothing/shoes/cowboyboots/black \ No newline at end of file + path = /obj/item/clothing/shoes/cowboyboots/black diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 57c5772f48..539187af8b 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -1,261 +1,250 @@ -/datum/gear/poncho +/datum/gear/suit + category = CATEGORY_SUIT + subcategory = SUBCATEGORY_SUIT_GENERAL + slot = SLOT_WEAR_SUIT + +/datum/gear/suit/poncho name = "Poncho" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/poncho -/datum/gear/ponchogreen +/datum/gear/suit/ponchogreen name = "Green poncho" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/poncho/green -/datum/gear/ponchored +/datum/gear/suit/ponchored name = "Red poncho" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/poncho/red -/datum/gear/redhood +/datum/gear/suit/redhood name = "Red cloak" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/cloak/david cost = 3 -/datum/gear/jacketbomber +/datum/gear/suit/jacketbomber name = "Bomber jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack +/datum/gear/suit/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack name = "Black flannel jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/flannel + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketflannelred +/datum/gear/suit/jacketflannelred name = "Red flannel jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/flannel/red + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketflannelaqua +/datum/gear/suit/jacketflannelaqua name = "Aqua flannel jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/flannel/aqua + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketflannelbrown +/datum/gear/suit/jacketflannelbrown name = "Brown flannel jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/flannel/brown + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketleather +/datum/gear/suit/jacketleather name = "Leather jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/leather + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/overcoatleather +/datum/gear/suit/overcoatleather name = "Leather overcoat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/leather/overcoat + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketpuffer +/datum/gear/suit/jacketpuffer name = "Puffer jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/puffer + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/vestpuffer +/datum/gear/suit/vestpuffer name = "Puffer vest" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/puffer/vest + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketlettermanbrown +/datum/gear/suit/jacketlettermanbrown name = "Brown letterman jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/letterman + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketlettermanred +/datum/gear/suit/jacketlettermanred name = "Red letterman jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/letterman_red + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/jacketlettermanNT +/datum/gear/suit/jacketlettermanNT name = "Nanotrasen letterman jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/letterman_nanotrasen + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/coat +/datum/gear/suit/coat name = "Winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat + subcategory = SUBCATEGORY_SUIT_COATS -/datum/gear/coat/aformal +/datum/gear/suit/coat/aformal name = "Assistant's formal winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/aformal -/datum/gear/coat/runed +/datum/gear/suit/coat/runed name = "Runed winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/narsie/fake -/datum/gear/coat/brass +/datum/gear/suit/coat/brass name = "Brass winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake -/datum/gear/coat/polycoat +/datum/gear/suit/coat/polycoat name = "Polychromic winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/polychromic cost = 4 //too many people with neon green coats is hard on the eyes -/datum/gear/coat/med +/datum/gear/suit/coat/med name = "Medical winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/medical restricted_roles = list("Chief Medical Officer", "Medical Doctor") // Reserve it to Medical Doctors and their boss, the Chief Medical Officer -/datum/gear/coat/paramedic +/datum/gear/suit/coat/paramedic name = "Paramedic winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/paramedic restricted_roles = list("Chief Medical Officer", "Paramedic") // Reserve it to Paramedics and their boss, the Chief Medical Officer -/datum/gear/coat/robotics +/datum/gear/suit/coat/robotics name = "Robotics winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/robotics restricted_roles = list("Research Director", "Roboticist") -/datum/gear/coat/sci +/datum/gear/suit/coat/sci name = "Science winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/science restricted_roles = list("Research Director", "Scientist", "Roboticist") // Reserve it to the Science Departement -/datum/gear/coat/eng +/datum/gear/suit/coat/eng name = "Engineering winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/engineering restricted_roles = list("Chief Engineer", "Station Engineer") // Reserve it to Station Engineers and their boss, the Chief Engineer -/datum/gear/coat/eng/atmos +/datum/gear/suit/coat/eng/atmos name = "Atmospherics winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos restricted_roles = list("Chief Engineer", "Atmospheric Technician") // Reserve it to Atmos Techs and their boss, the Chief Engineer -/datum/gear/coat/hydro +/datum/gear/suit/coat/hydro name = "Hydroponics winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/hydro restricted_roles = list("Head of Personnel", "Botanist") // Reserve it to Botanists and their boss, the Head of Personnel -/datum/gear/coat/bar +/datum/gear/suit/coat/bar name = "Bar winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/bar restricted_roles = list("Bartender") // Reserve it to Bartenders and not the Head of Personnel because he doesnt deserve to look as fancy as them -/datum/gear/coat/cargo +/datum/gear/suit/coat/cargo name = "Cargo winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/cargo restricted_roles = list("Quartermaster", "Cargo Technician") // Reserve it to Cargo Techs and their boss, the Quartermaster -/datum/gear/coat/miner +/datum/gear/suit/coat/miner name = "Mining winter coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/miner restricted_roles = list("Quartermaster", "Shaft Miner") // Reserve it to Miners and their boss, the Quartermaster -/datum/gear/militaryjacket +/datum/gear/suit/militaryjacket name = "Military Jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/jacket/miljacket + subcategory = SUBCATEGORY_SUIT_JACKETS -/datum/gear/ianshirt +/datum/gear/suit/ianshirt name = "Ian Shirt" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/ianshirt -/datum/gear/flakjack +/datum/gear/suit/flakjack name = "Flak Jacket" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/flakjack + subcategory = SUBCATEGORY_SUIT_JACKETS cost = 2 -/datum/gear/trekds9_coat +/datum/gear/suit/trekds9_coat name = "DS9 Overcoat (use uniform)" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/trek/ds9 + subcategory = SUBCATEGORY_SUIT_JOBS restricted_desc = "All, barring Service and Civilian" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster", "Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist", "Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer", "Cargo Technician", "Shaft Miner") //everyone who actually deserves a job. //Federation jackets from movies -/datum/gear/trekcmdcap +/datum/gear/suit/trekcmdcap name = "Fed (movie) uniform, Black" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt + subcategory = SUBCATEGORY_SUIT_JOBS restricted_roles = list("Captain","Head of Personnel") -/datum/gear/trekcmdmov +/datum/gear/suit/trekcmdmov name = "Fed (movie) uniform, Red" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat + subcategory = SUBCATEGORY_SUIT_JOBS restricted_desc = "Heads of Staff and Security" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer") -/datum/gear/trekmedscimov +/datum/gear/suit/trekmedscimov name = "Fed (movie) uniform, Blue" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci + subcategory = SUBCATEGORY_SUIT_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekengmov +/datum/gear/suit/trekengmov name = "Fed (movie) uniform, Yellow" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng + subcategory = SUBCATEGORY_SUIT_JOBS restricted_desc = "Engineering and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") -/datum/gear/trekcmdcapmod +/datum/gear/suit/trekcmdcapmod name = "Fed (Modern) uniform, White" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/modernfedcoat restricted_roles = list("Captain","Head of Personnel") -/datum/gear/trekcmdmod +/datum/gear/suit/trekcmdmod name = "Fed (Modern) uniform, Red" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/sec + subcategory = SUBCATEGORY_SUIT_JOBS restricted_desc = "Heads of Staff and Security" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer") -/datum/gear/trekmedscimod +/datum/gear/suit/trekmedscimod name = "Fed (Modern) uniform, Blue" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci + subcategory = SUBCATEGORY_SUIT_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekengmod +/datum/gear/suit/trekengmod name = "Fed (Modern) uniform, Yellow" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/eng + subcategory = SUBCATEGORY_SUIT_JOBS restricted_desc = "Engineering and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") -/datum/gear/christmascoatr +/datum/gear/suit/christmascoatr name = "Red Christmas Coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatr + subcategory = SUBCATEGORY_SUIT_COATS -/datum/gear/christmascoatg +/datum/gear/suit/christmascoatg name = "Green Christmas Coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatg + subcategory = SUBCATEGORY_SUIT_COATS -/datum/gear/christmascoatrg +/datum/gear/suit/christmascoatrg name = "Red and Green Christmas Coat" - category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg + subcategory = SUBCATEGORY_SUIT_COATS + +/datum/gear/suit/samurai + name = "Samurai outfit" + path = /obj/item/clothing/suit/samurai diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e667626968..e693f9d2f7 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -1,562 +1,542 @@ -/datum/gear/suitblack - name = "Black suit" - category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/suit/black +/datum/gear/uniform + category = CATEGORY_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_GENERAL + slot = SLOT_W_UNIFORM -/datum/gear/suitgreen +/datum/gear/uniform/suit + name = "Black suit" + path = /obj/item/clothing/under/suit/black + subcategory = SUBCATEGORY_UNIFORM_SUITS + +/datum/gear/uniform/suit/green name = "Green suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/suit/green -/datum/gear/suitred +/datum/gear/uniform/suit/red name = "Red suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/suit/red -/datum/gear/suitcharcoal +/datum/gear/uniform/suit/charcoal name = "Charcoal suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/suit/charcoal -/datum/gear/suitnavy +/datum/gear/uniform/suit/navy name = "Navy suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/suit/navy -/datum/gear/suitburgundy +/datum/gear/uniform/suit/burgundy name = "Burgundy suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/suit/burgundy -/datum/gear/suittan +/datum/gear/uniform/suit/tan name = "Tan suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/suit/tan -/datum/gear/suitwhite +/datum/gear/uniform/suit/white name = "White suit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/suit/white -/datum/gear/assistantformal +/datum/gear/uniform/assistantformal name = "Assistant's formal uniform" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/assistantformal -/datum/gear/maidcostume +/datum/gear/uniform/maidcostume name = "Maid costume" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/maid -/datum/gear/mailmanuniform +/datum/gear/uniform/mailmanuniform name = "Mailman's jumpsuit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/mailman -/datum/gear/skirtblack +/datum/gear/uniform/skirt name = "Black skirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt + subcategory = SUBCATEGORY_UNIFORM_SKIRTS -/datum/gear/skirtblue +/datum/gear/uniform/skirt/blue name = "Blue skirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt/blue -/datum/gear/skirtred +/datum/gear/uniform/skirt/red name = "Red skirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt/red -/datum/gear/skirtpurple +/datum/gear/uniform/skirt/purple name = "Purple skirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt/purple -/datum/gear/skirtplaid +/datum/gear/uniform/skirt/plaid name = "Plaid skirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt/plaid -/datum/gear/schoolgirlblue +/datum/gear/uniform/schoolgirlblue name = "Blue Schoolgirl Uniform" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/schoolgirl -/datum/gear/schoolgirlred +/datum/gear/uniform/schoolgirlred name = "Red Schoolgirl Uniform" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/schoolgirl/red -/datum/gear/schoolgirlgreen +/datum/gear/uniform/schoolgirlgreen name = "Green Schoolgirl Uniform" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/schoolgirl/green -/datum/gear/schoolgirlorange +/datum/gear/uniform/schoolgirlorange name = "Orange Schoolgirl Uniform" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/schoolgirl/orange -/datum/gear/stripeddress +/datum/gear/uniform/dress name = "Striped Dress" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/striped + subcategory = SUBCATEGORY_UNIFORM_DRESSES -/datum/gear/sundresswhite +/datum/gear/uniform/dress/sun/white name = "White Sundress" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/sundress/white -/datum/gear/sundress +/datum/gear/uniform/dress/sun name = "Sundress" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/sundress -/datum/gear/greendress +/datum/gear/uniform/dress/green name = "Green Dress" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/green -/datum/gear/pinkdress +/datum/gear/uniform/dress/pink name = "Pink Dress" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/pink -/datum/gear/flowerdress + +/datum/gear/uniform/dress/orange name = "Flower Dress" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/flower -/datum/gear/sweptskirt +/datum/gear/uniform/skirt/swept name = "Swept skirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt/swept -/datum/gear/croptop +/datum/gear/uniform/croptop name = "Croptop" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/croptop -/datum/gear/yoga +/datum/gear/uniform/pants name = "Yoga Pants" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/yoga + subcategory = SUBCATEGORY_UNIFORM_PANTS -/datum/gear/kilt +/datum/gear/uniform/kilt name = "Kilt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/kilt -/datum/gear/camoshorts +/datum/gear/uniform/pants/camo name = "Camo Pants" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/camo -/datum/gear/athleticshorts +/datum/gear/uniform/shorts name = "Athletic Shorts" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/shorts/red + subcategory = SUBCATEGORY_UNIFORM_SHORTS -/datum/gear/bjeans +/datum/gear/uniform/pants/bjeans name = "Black Jeans" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/blackjeans -/datum/gear/cjeans +/datum/gear/uniform/pants/cjeans name = "Classic Jeans" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/classicjeans -/datum/gear/khaki +/datum/gear/uniform/pants/khaki name = "Khaki Pants" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/khaki -/datum/gear/wpants +/datum/gear/uniform/pants/white name = "White Pants" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/white -/datum/gear/rpants +/datum/gear/uniform/pants/red name = "Red Pants" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/red -/datum/gear/tpants +/datum/gear/uniform/pants/tan name = "Tan Pants" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/tan -/datum/gear/trpants +/datum/gear/uniform/pants/track name = "Track Pants" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/track -/datum/gear/rippedjeans +/datum/gear/uniform/pants/ripped name = "Ripped Jeans" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/jeanripped -/datum/gear/jeanshort +/datum/gear/uniform/shorts/jean name = "Jean Shorts" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/jeanshort -/datum/gear/denimskirt +/datum/gear/uniform/skirt/denim name = "Denim Skirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/denimskirt -/datum/gear/yoga - name = "Yoga Pants" - category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/pants/yoga - // Pantsless Sweaters -/datum/gear/turtleneck +/datum/gear/uniform/turtleneck name = "Tactitool Turtleneck" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/syndicate/cosmetic -/datum/gear/creamsweater +/datum/gear/uniform/sweater name = "Cream Commando Sweater" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/sweater + subcategory = SUBCATEGORY_UNIFORM_SWEATERS -/datum/gear/blacksweater +/datum/gear/uniform/sweater/black name = "Black Commando Sweater" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/sweater/black -/datum/gear/purpsweater +/datum/gear/uniform/sweater/purple name = "Purple Commando Sweater" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/sweater/purple -/datum/gear/greensweater +/datum/gear/uniform/sweater/green name = "Green Commando Sweater" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/sweater/green -/datum/gear/redsweater +/datum/gear/uniform/sweater/red name = "Red Commando Sweater" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/sweater/red -/datum/gear/bluesweater +/datum/gear/uniform/sweater/blue name = "Navy Commando Sweater" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/sweater/blue -/datum/gear/keyholesweater +/datum/gear/uniform/sweater/keyhole name = "Keyhole Sweater" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/keyholesweater -/datum/gear/polyjump +/datum/gear/uniform/polyjump name = "Polychromic Jumpsuit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/polyjumpsuit cost = 2 - -/datum/gear/polyskirt + +/datum/gear/uniform/skirt/poly name = "Polychromic Jumpskirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt/polychromic cost = 2 -/datum/gear/polysuit +/datum/gear/uniform/suit/poly name = "Polychromic Button-up Shirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/poly_shirt cost = 3 - -/datum/gear/polypleated + +/datum/gear/uniform/skirt/poly/pleated name = "Polychromic Pleated Sweaterskirt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/dress/skirt/polychromic/pleated cost = 3 -/datum/gear/polykilt +/datum/gear/uniform/polykilt name = "Polychromic Kilt" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/kilt/polychromic cost = 3 -/datum/gear/polyshorts +/datum/gear/uniform/shorts/poly name = "Polychromic Shorts" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/polyshorts cost = 3 -/datum/gear/polyshortpants +/datum/gear/uniform/shorts/poly/athletic name = "Polychromic Athletic Shorts" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/shorts/polychromic cost = 2 // Trekie things //TOS -/datum/gear/trekcmdtos +/datum/gear/uniform/trekcmdtos name = "TOS uniform, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") -/datum/gear/trekmedscitos +/datum/gear/uniform/trekmedscitos name = "TOS uniform, med/sci" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekengtos +/datum/gear/uniform/trekengtos name = "TOS uniform, ops/sec" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //TNG -/datum/gear/trekcmdtng +/datum/gear/uniform/trekcmdtng name = "TNG uniform, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command/next + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") -/datum/gear/trekmedscitng +/datum/gear/uniform/trekmedscitng name = "TNG uniform, med/sci" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/next + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekengtng +/datum/gear/uniform/trekengtng name = "TNG uniform, ops/sec" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/next + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //VOY -/datum/gear/trekcmdvoy +/datum/gear/uniform/trekcmdvoy name = "VOY uniform, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command/voy + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") -/datum/gear/trekmedscivoy +/datum/gear/uniform/trekmedscivoy name = "VOY uniform, med/sci" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/voy + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekengvoy +/datum/gear/uniform/trekengvoy name = "VOY uniform, ops/sec" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/voy + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //DS9 -/datum/gear/trekcmdds9 +/datum/gear/uniform/trekcmdds9 name = "DS9 uniform, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command/ds9 + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") -/datum/gear/trekmedscids9 +/datum/gear/uniform/trekmedscids9 name = "DS9 uniform, med/sci" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/ds9 + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekengds9 +/datum/gear/uniform/trekengds9 name = "DS9 uniform, ops/sec" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/ds9 + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //ENT -/datum/gear/trekcmdent +/datum/gear/uniform/trekcmdent name = "ENT uniform, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command/ent + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") -/datum/gear/trekmedscient +/datum/gear/uniform/trekmedscient name = "ENT uniform, med/sci" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/ent + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") -/datum/gear/trekengent +/datum/gear/uniform/trekengent name = "ENT uniform, ops/sec" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/ent + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //TheMotionPicture -/datum/gear/trekfedutil +/datum/gear/uniform/trekfedutil name = "TMP uniform" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/fedutil + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "All, barring Service and Civilian" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster", "Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist", "Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer", "Cargo Technician", "Shaft Miner") -/datum/gear/trekfedtrainee +/datum/gear/uniform/trekfedtrainee name = "TMP uniform, trainee" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/fedutil/trainee + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Assistant", "Janitor", "Cargo Technician") -/datum/gear/trekfedservice +/datum/gear/uniform/trekfedservice name = "TMP uniform, service" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/fedutil/service + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer" restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain") //Orvilike -/datum/gear/orvcmd +/datum/gear/uniform/orvcmd name = "ORV uniform, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command/orv + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") -/datum/gear/orvcmd_capt +/datum/gear/uniform/orvcmd_capt name = "ORV uniform, capt" - category = SLOT_W_UNIFORM + subcategory = SUBCATEGORY_UNIFORM_JOBS path = /obj/item/clothing/under/trek/command/orv/captain restricted_roles = list("Captain") -/datum/gear/orvmedsci +/datum/gear/uniform/orvmedsci name = "ORV uniform, med/sci" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/orv + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist") -/datum/gear/orvcmd_medsci +/datum/gear/uniform/orvcmd_medsci name = "ORV uniform, med/sci, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command/orv/medsci + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Chief Medical Officer", "Research Director") -/datum/gear/orvops +/datum/gear/uniform/orvops name = "ORV uniform, ops/sec" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/orv + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Engineering, Security and Cargo" restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster") -/datum/gear/orvcmd_ops +/datum/gear/uniform/orvcmd_ops name = "ORV uniform, ops/sec, cmd" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/command/orv/engsec + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Chief Engineer", "Head of Security") -/datum/gear/orvass +/datum/gear/uniform/orvass name = "ORV uniform, assistant" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/orv + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Assistant") -/datum/gear/orvsrv +/datum/gear/uniform/orvsrv name = "ORV uniform, service" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/orv/service + subcategory = SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain") restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer" //Memes -/datum/gear/gear_harnesses +/datum/gear/uniform/gear_harnesses name = "Gear Harness" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/gear_harness //Christmas /*Commenting out Until next Christmas or made automatic -/datum/gear/christmasmaler +/datum/gear/uniform/christmasmaler name = "Red Masculine Christmas Suit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/christmas -/datum/gear/christmasmaleg +/datum/gear/uniform/christmasmaleg name = "Green Masculine Christmas Suit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/christmas/green -/datum/gear/christmasfemaler +/datum/gear/uniform/christmasfemaler name = "Red Feminine Christmas Suit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/christmas/croptop -/datum/gear/christmasfemaleg +/datum/gear/uniform/christmasfemaleg name = "Green Feminine Christmas Suit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/christmas/croptop/green -/datum/gear/pinkstripper +/datum/gear/uniform/pinkstripper name = "Pink stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/stripper cost = 3 */ -/datum/gear/greenstripper +/datum/gear/uniform/greenstripper name = "Green stripper outfit" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/misc/stripper/green cost = 3 -/datum/gear/qipao +/datum/gear/uniform/qipao name = "Qipao, Black" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/qipao + subcategory = SUBCATEGORY_UNIFORM_DRESSES cost = 3 -/datum/gear/qipao/white +/datum/gear/uniform/qipao/white name = "Qipao, White" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/qipao/white + subcategory = SUBCATEGORY_UNIFORM_DRESSES cost = 3 -/datum/gear/qipao/red +/datum/gear/uniform/qipao/red name = "Qipao, Red" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/qipao/red + subcategory = SUBCATEGORY_UNIFORM_DRESSES cost = 3 -/datum/gear/cheongsam +/datum/gear/uniform/cheongsam name = "Cheongsam, Black" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/cheongsam + subcategory = SUBCATEGORY_UNIFORM_DRESSES cost = 3 -/datum/gear/cheongsam/white +/datum/gear/uniform/cheongsam/white name = "Cheongsam, White" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/cheongsam/white + subcategory = SUBCATEGORY_UNIFORM_DRESSES cost = 3 -/datum/gear/cheongsam/red +/datum/gear/uniform/cheongsam/red name = "Cheongsam, Red" - category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/cheongsam/red + subcategory = SUBCATEGORY_UNIFORM_DRESSES cost = 3 + +/datum/gear/uniform/dress/black + name = "Black dress" + path = /obj/item/clothing/under/misc/black_dress + +/datum/gear/uniform/skirt/pinktutu + name = "Pink tutu" + path = /obj/item/clothing/under/misc/pinktutu + +/datum/gear/uniform/bathrobe + name = "Bathrobe" + path = /obj/item/clothing/under/misc/bathrobe + +/datum/gear/uniform/kimono + name = "Kimono" + path = /obj/item/clothing/under/costume/kimono + +/datum/gear/uniform/kimono/black + name = "Black kimono" + path = /obj/item/clothing/under/costume/kimono/black + +/datum/gear/uniform/kimono/kamishimo + name = "Kamishimo" + path = /obj/item/clothing/under/costume/kimono/kamishimo + +/datum/gear/uniform/kimono/fancy + name = "Fancy kimono" + path = /obj/item/clothing/under/costume/kimono/fancy + +/datum/gear/uniform/kimono/sakura + name = "Sakura kimono" + path = /obj/item/clothing/under/costume/kimono/sakura \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index a4781bab13..faa1ce990c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -61,6 +61,7 @@ #include "code\__DEFINES\language.dm" #include "code\__DEFINES\layers_planes.dm" #include "code\__DEFINES\lighting.dm" +#include "code\__DEFINES\loadout.dm" #include "code\__DEFINES\logging.dm" #include "code\__DEFINES\machines.dm" #include "code\__DEFINES\maps.dm" @@ -200,6 +201,7 @@ #include "code\_globalvars\lists\client.dm" #include "code\_globalvars\lists\flavor_misc.dm" #include "code\_globalvars\lists\keybindings.dm" +#include "code\_globalvars\lists\loadout_categories.dm" #include "code\_globalvars\lists\maintenance_loot.dm" #include "code\_globalvars\lists\mapping.dm" #include "code\_globalvars\lists\medals.dm"