From 39d3d37ec4c3093e9e0c17444cd9eae2aecac9a1 Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Sat, 1 Nov 2025 22:04:05 +0000 Subject: [PATCH] Moving Loadouts to Zubbers: Shoes (#4873) ## About The Pull Request To prevent myself from having a mental breakdown again. I'm gonna be atomizing this project into bite sized PRs. Part 1 is shoes. ## Why It's Good For The Game Org good. ## Proof Of Testing image image The only shoes left in the boots section are TG boots, and I'd rather not do a non-modular override just so it looks nicer. ## Changelog :cl: qol: Loadout Shoes have been organised and moved to the Zubbers folder. fix: Prevents Snake gloves from breaking via unintended reskinning. /:cl: --- .../loadout/categories/donator_personal.dm | 36 -- .../code/modules/loadout/categories/shoes.dm | 277 ------------- .../code/modules/clothing/gloves/misc.dm | 1 + .../code/modules/loadout/categories/shoes.dm | 383 ++++++++++++++++-- .../categories/~donator/donator_personal.dm | 4 +- .../overrides/loadout_items/loadout_datum.dm | 5 - tgstation.dme | 1 - 7 files changed, 344 insertions(+), 363 deletions(-) delete mode 100644 modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm index 24e59f3dd61..8187cd19842 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm @@ -48,11 +48,6 @@ item_path = /obj/item/clothing/gloves/ring/hypno/bippys ckeywhitelist = list("bippys") -/datum/loadout_item/shoes/rax_armadyne_boots - name = "Tactical Boots" - item_path = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne/rax - //ckeywhitelist = list("raxraus") - /datum/loadout_item/suit/rax_peacekeeper_jacket name = "Peacekeeper jacket" item_path = /obj/item/clothing/suit/armor/vest/warden/rax @@ -106,11 +101,6 @@ item_path = /obj/item/clothing/head/avipilot //ckeywhitelist = list("slippyjoe") -/datum/loadout_item/shoes/britches_shoes - name = "Britches' shoes" - item_path = /obj/item/clothing/shoes/clown_shoes/britches - //ckeywhitelist = list("bloodrite") - /datum/loadout_item/uniform/britches_dress name = "Britches' dress" item_path = /obj/item/clothing/under/rank/civilian/clown/britches @@ -218,11 +208,6 @@ item_path = /obj/item/clothing/gloves/netra //ckeywhitelist = list("netrakyram") -/datum/loadout_item/shoes/metra_boots - name = "Polished Jackboots" - item_path = /obj/item/clothing/shoes/jackboots/netra - //ckeywhitelist = list("netrakyram") - /datum/loadout_item/neck/kiaracloak name = "Kiara's cloak" item_path = /obj/item/clothing/neck/cloak/inferno @@ -308,11 +293,6 @@ item_path = /obj/item/clothing/gloves/mikugloves //ckeywhitelist = list("grandvegeta") -/datum/loadout_item/shoes/mikulegging - name = "starlight singer bikini" - item_path = /obj/item/clothing/shoes/sneakers/mikuleggings - //ckeywhitelist = list("grandvegeta") - /datum/loadout_item/suit/delta_coat name = "Grey Winter Hoodie" item_path = /obj/item/clothing/suit/jacket/delta @@ -560,11 +540,6 @@ item_path = /obj/item/storage/fancy/cigarettes/khi //ckeywhitelist = list("ultimarifox") -/datum/loadout_item/shoes/dragheels - name = "Fancy Heels (dragmeme)" - item_path = /obj/item/clothing/shoes/fancy_heels/drag - //ckeywhitelist = list("thedragmeme") - /datum/loadout_item/uniform/bimpcap name = "Formal Matte Black Captain Uniform" item_path = /obj/item/clothing/under/bimpcap @@ -606,12 +581,6 @@ loadout_flags = parent_type::loadout_flags | LOADOUT_FLAG_ALLOW_RESKIN // ckeywhitelist = list("october23") -/datum/loadout_item/shoes/elofy - name = "Solar Admiral Boots" - item_path = /obj/item/clothing/shoes/jackboots/elofy - loadout_flags = parent_type::loadout_flags | LOADOUT_FLAG_ALLOW_RESKIN -// ckeywhitelist = list("october23") - /datum/loadout_item/pocket_items/transponder name = "Broken Helian Transponder" item_path = /obj/item/donator/transponder @@ -729,11 +698,6 @@ item_path = /obj/item/clothing/under/rank/civilian/chaplain/divine_archer/noble // ckeywhitelist = list("grasshand") -/datum/loadout_item/shoes/noble_boots - name = "Noble Boots" - item_path = /obj/item/clothing/shoes/jackboots/noble - //ckeywhitelist = list("grasshand") - /datum/loadout_item/suit/nobility_dresscoat name = "Nobility Dresscoat" item_path = /obj/item/clothing/suit/toggle/labcoat/vic_dresscoat_donator diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm b/modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm deleted file mode 100644 index f1f3e30b80e..00000000000 --- a/modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm +++ /dev/null @@ -1,277 +0,0 @@ -/datum/loadout_category/shoes - category_name = "Shoes" - category_ui_icon = FA_ICON_SHOE_PRINTS - type_to_generate = /datum/loadout_item/shoes - tab_order = /datum/loadout_category/head::tab_order + 11 - -/datum/loadout_item/shoes - abstract_type = /datum/loadout_item/shoes - -/datum/loadout_item/shoes/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only, loadout_placement_preference) - if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.shoes) - LAZYADD(outfit.backpack_contents, outfit.shoes) - outfit.shoes = item_path - -/* -* JACKBOOTS -*/ - -/datum/loadout_item/shoes/jackboots - name = "Jackboots" - item_path = /obj/item/clothing/shoes/jackboots - -// Thedragmeme's donator reward, they've decided to make them available to everybody. -/datum/loadout_item/shoes/jackboots/heel - name = "High-Heel Jackboots" - item_path = /obj/item/clothing/shoes/jackboots/heel - -/datum/loadout_item/shoes/kneeboot - name = "Knee Boots" - item_path = /obj/item/clothing/shoes/jackboots/knee - -/datum/loadout_item/shoes/recolorable_jackboots - name = "Recolorable Jackboots" - item_path = /obj/item/clothing/shoes/jackboots/recolorable - -/datum/loadout_item/shoes/jackboots/sec - name = "security jackboots" - item_path = /obj/item/clothing/shoes/jackboots/sec - restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) - - -/datum/loadout_item/shoes/jackboots/peacekeeper - name = "Armadyne combat boots" - item_path = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne - restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) - -/datum/loadout_item/shoes/jackboots/gogo_boots - name = "Tactical Go-Go boots" - item_path = /obj/item/clothing/shoes/jackboots/gogo_boots - restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) - -/* -* MISC BOOTS -*/ - -/datum/loadout_item/shoes/timbs - name = "Fashionable Boots" - item_path = /obj/item/clothing/shoes/jackboots/timbs - -/datum/loadout_item/shoes/jungle - name = "Jungle Boots" - item_path = /obj/item/clothing/shoes/jungleboots - -/datum/loadout_item/shoes/winter_boots - name = "Winter Boots" - item_path = /obj/item/clothing/shoes/winterboots - -/datum/loadout_item/shoes/work_boots - name = "Work Boots" - item_path = /obj/item/clothing/shoes/workboots - -/datum/loadout_item/shoes/work_boots/heeled - name = "Heeled Work Boots" - item_path = /obj/item/clothing/shoes/workboots/heeled - -/datum/loadout_item/shoes/work_boots/old - name = "Old Work Boots" - item_path = /obj/item/clothing/shoes/workboots/old - -/datum/loadout_item/shoes/mining_boots - name = "Mining Boots" - item_path = /obj/item/clothing/shoes/workboots/mining - -/datum/loadout_item/shoes/mining_boots/heeled - name = "Heeled Mining Boots" - item_path = /obj/item/clothing/shoes/workboots/mining/heeled - -/datum/loadout_item/shoes/russian_boots - name = "Russian Boots" - item_path = /obj/item/clothing/shoes/russian - -/* -* COWBOY -*/ - -/datum/loadout_item/shoes/brown_cowboy_boots - name = "Brown Cowboy Boots" - item_path = /obj/item/clothing/shoes/cowboy - -/datum/loadout_item/shoes/black_cowboy_boots - name = "Black Cowboy Boots" - item_path = /obj/item/clothing/shoes/cowboy/black - -/datum/loadout_item/shoes/white_cowboy_boots - name = "White Cowboy Boots" - item_path = /obj/item/clothing/shoes/cowboy/white - -/datum/loadout_item/shoes/cowboyboots - name = "Cowboy Boots (Brown)" - item_path = /obj/item/clothing/shoes/cowboyboots - -/datum/loadout_item/shoes/cowboyboots_black - name = "Cowboy Boots (Black)" - item_path = /obj/item/clothing/shoes/cowboyboots/black - -/* -* SNEAKERS -*/ - -/datum/loadout_item/shoes/black_sneakers - name = "Black Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/black - -/datum/loadout_item/shoes/blue_sneakers - name = "Blue Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/blue - -/datum/loadout_item/shoes/brown_sneakers - name = "Brown Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/brown - -/datum/loadout_item/shoes/green_sneakers - name = "Green Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/green - -/datum/loadout_item/shoes/purple_sneakers - name = "Purple Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/purple - -/datum/loadout_item/shoes/orange_sneakers - name = "Orange Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/orange - -/datum/loadout_item/shoes/yellow_sneakers - name = "Yellow Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/yellow - -/datum/loadout_item/shoes/white_sneakers - name = "White Sneakers" - item_path = /obj/item/clothing/shoes/sneakers/white - -/* -* LEG WRAPS -*/ - -/datum/loadout_item/shoes/gildedcuffs - name = "Gilded Leg Wraps" - item_path = /obj/item/clothing/shoes/wraps - -/datum/loadout_item/shoes/silvercuffs - name = "Silver Leg Wraps" - item_path = /obj/item/clothing/shoes/wraps/silver - -/datum/loadout_item/shoes/redcuffs - name = "Red Leg Wraps" - item_path = /obj/item/clothing/shoes/wraps/red - -/datum/loadout_item/shoes/bluecuffs - name = "Blue Leg Wraps" - item_path = /obj/item/clothing/shoes/wraps/blue - -/datum/loadout_item/shoes/cuffs/colourable - name = "Colourable Leg Wraps" - item_path = /obj/item/clothing/shoes/wraps/colourable - -/datum/loadout_item/shoes/clothwrap - name = "Colourable Cloth Wraps" - item_path = /obj/item/clothing/shoes/wraps/cloth - -/* -* MISC -*/ - -/datum/loadout_item/shoes/laceup - name = "Laceup Shoes" - item_path = /obj/item/clothing/shoes/laceup - -/datum/loadout_item/shoes/recolorable_laceups - name = "Recolorable Laceups" - item_path = /obj/item/clothing/shoes/colorable_laceups - -/datum/loadout_item/shoes/recolorable_sandals - name = "Recolorble Sandals" - item_path = /obj/item/clothing/shoes/colorable_sandals - -/datum/loadout_item/shoes/high_heels - name = "High Heels" - item_path = /obj/item/clothing/shoes/high_heels - -/datum/loadout_item/shoes/black_heels - name = "Fancy Heels" - item_path = /obj/item/clothing/shoes/fancy_heels - -/datum/loadout_item/shoes/disco - name = "Green Snakeskin Shoes" - item_path = /obj/item/clothing/shoes/discoshoes - -/datum/loadout_item/shoes/kim - name = "Aerostatic Boots" - item_path = /obj/item/clothing/shoes/jackboots/kim - -/datum/loadout_item/shoes/dominaheels - name = "Dominant Heels" - item_path = /obj/item/clothing/shoes/latex_heels/domina_heels - erp_item = TRUE - -/datum/loadout_item/shoes/griffin - name = "Griffon Boots" - item_path = /obj/item/clothing/shoes/griffin - -/datum/loadout_item/shoes/sandals - name = "Sandals" - item_path = /obj/item/clothing/shoes/sandal - -/datum/loadout_item/shoes/sportshoes - name = "Sport Shoes" - item_path = /obj/item/clothing/shoes/sports - -/datum/loadout_item/shoes/rollerskates - name = "Roller Skates" - item_path = /obj/item/clothing/shoes/wheelys/rollerskates - -/datum/loadout_item/shoes/jingleshoes - name = "Jester Shoes" - item_path = /obj/item/clothing/shoes/jester_shoes - -/* -* SEASONAL -*/ - -/datum/loadout_item/shoes/christmas - name = "Red Christmas Boots" - item_path = /obj/item/clothing/shoes/winterboots/christmas - -/datum/loadout_item/shoes/christmas/green - name = "Green Christmas Boots" - item_path = /obj/item/clothing/shoes/winterboots/christmas/green - - -/* -* JOB-RESTRICTED -*/ - -/datum/loadout_item/shoes/jester - name = "Clown's Jester Shoes" - item_path = /obj/item/clothing/shoes/clown_shoes/jester - restricted_roles = list(JOB_CLOWN) - -/datum/loadout_item/shoes/clown_shoes/pink - name = "Pink Clown Shoes" - item_path = /obj/item/clothing/shoes/clown_shoes/pink - restricted_roles = list(JOB_CLOWN) - -/* -* DONATOR -*/ - -/datum/loadout_item/shoes/donator - donator_only = TRUE - -/datum/loadout_item/shoes/donator/blackjackboots - name = "Black Jackboots" - item_path = /obj/item/clothing/shoes/jackboots/black - -/datum/loadout_item/shoes/donator/rainbow - name = "Rainbow Converse" - item_path = /obj/item/clothing/shoes/sneakers/rainbow diff --git a/modular_zubbers/code/modules/clothing/gloves/misc.dm b/modular_zubbers/code/modules/clothing/gloves/misc.dm index 1819b10608d..3c26e654084 100644 --- a/modular_zubbers/code/modules/clothing/gloves/misc.dm +++ b/modular_zubbers/code/modules/clothing/gloves/misc.dm @@ -56,6 +56,7 @@ icon = 'modular_zubbers/icons/obj/clothing/gloves/gloves.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/gloves/gloves.dmi' icon_state = "snake" + unique_reskin = null /obj/item/clothing/gloves/bubber/snake name = "big boss' gloves" diff --git a/modular_zubbers/code/modules/loadout/categories/shoes.dm b/modular_zubbers/code/modules/loadout/categories/shoes.dm index 1d7757ce65d..54dd821a4a5 100644 --- a/modular_zubbers/code/modules/loadout/categories/shoes.dm +++ b/modular_zubbers/code/modules/loadout/categories/shoes.dm @@ -1,51 +1,350 @@ -//Title Capitalization for names please!!! +/datum/loadout_category/shoes + category_name = "Shoes" + category_ui_icon = FA_ICON_SHOE_PRINTS + type_to_generate = /datum/loadout_item/shoes + tab_order = /datum/loadout_category/head::tab_order + 11 -/datum/loadout_item/shoes/bubber/clown/pink/squeak //Unlike the rest, these make noise. Job locked. +/datum/loadout_item/shoes + abstract_type = /datum/loadout_item/shoes + +/datum/loadout_item/shoes/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only, loadout_placement_preference) + if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.shoes) + LAZYADD(outfit.backpack_contents, outfit.shoes) + outfit.shoes = item_path + +/* +* JACKBOOTS +*/ + +/datum/loadout_item/shoes/boots + group = "Boots" + abstract_type = /datum/loadout_item/shoes/boots + +/datum/loadout_item/shoes/boots/jackboots + name = "Jackboots" + item_path = /obj/item/clothing/shoes/jackboots + +/datum/loadout_item/shoes/boots/jackboots/recolorable + name = "Jackboots (Recolorable)" + item_path = /obj/item/clothing/shoes/jackboots/recolorable + +/datum/loadout_item/shoes/boots/metra_boots + name = "Polished Jackboots" + item_path = /obj/item/clothing/shoes/jackboots/netra + //ckeywhitelist = list("netrakyram") + +/datum/loadout_item/shoes/boots/jackboots/sec + name = "Security Jackboots" + item_path = /obj/item/clothing/shoes/jackboots/sec + restricted_roles = list(ALL_JOBS_SEC) + +// Thedragmeme's donator reward, they've decided to make them available to everybody. +/datum/loadout_item/shoes/boots/jackboots/heel + name = "High-Heel Jackboots" + item_path = /obj/item/clothing/shoes/jackboots/heel + +/datum/loadout_item/shoes/boots/jackboots/rax_armadyne_boots + name = "Tactical Boots" + item_path = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne/rax + //ckeywhitelist = list("raxraus") + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/shoes/boots/jackboots/kneeboots + name = "Knee Boots" + item_path = /obj/item/clothing/shoes/jackboots/knee + +/datum/loadout_item/shoes/boots/jackboots/peacekeeper + name = "Armadyne Combat Boots" + item_path = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/shoes/boots/jackboots/gogo_boots + name = "Tactical Go-Go boots" + item_path = /obj/item/clothing/shoes/jackboots/gogo_boots + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/shoes/boots/diesel_m + name = "Male Diesel Boots" + item_path = /obj/item/clothing/shoes/jackboots/diesel_m + +/datum/loadout_item/shoes/boots/diesel_f + name = "Female Diesel Boots" + item_path = /obj/item/clothing/shoes/jackboots/diesel_f + +/datum/loadout_item/shoes/boots/frontier_colonist + name = "Frontier Boots" + item_path = /obj/item/clothing/shoes/jackboots/frontier_colonist/loadout + +/datum/loadout_item/shoes/boots/jackboots/toeless + name = "Toeless Jackboots" + item_path = /obj/item/clothing/shoes/jackboots/toeless + +/datum/loadout_item/shoes/boots/kim + name = "Aerostatic Boots" + item_path = /obj/item/clothing/shoes/jackboots/kim + +/datum/loadout_item/shoes/boots/jackboots/black + name = "Black Jackboots" + item_path = /obj/item/clothing/shoes/jackboots/black + +/datum/loadout_item/shoes/boots/elofy + name = "Solar Admiral Boots" + item_path = /obj/item/clothing/shoes/jackboots/elofy + loadout_flags = parent_type::loadout_flags | LOADOUT_FLAG_ALLOW_RESKIN +// ckeywhitelist = list("october23") + +/* +* MISC BOOTS +*/ + +/datum/loadout_item/shoes/boots/jackboots/timbs + name = "Fashionable Boots" + item_path = /obj/item/clothing/shoes/jackboots/timbs + +/datum/loadout_item/shoes/boots/jackboots/jungle + name = "Jungle Boots" + item_path = /obj/item/clothing/shoes/jungleboots + +/datum/loadout_item/shoes/boots/winter_boots + name = "Winter Boots" + item_path = /obj/item/clothing/shoes/winterboots + +/datum/loadout_item/shoes/boots/work_boots + name = "Work Boots" + item_path = /obj/item/clothing/shoes/workboots + +/datum/loadout_item/shoes/boots/work_boots/heeled + name = "Heeled Work Boots" + item_path = /obj/item/clothing/shoes/workboots/heeled + +/datum/loadout_item/shoes/boots/work_boots/old + name = "Work Boots (Old)" + item_path = /obj/item/clothing/shoes/workboots/old + +/datum/loadout_item/shoes/boots/mining_boots + name = "Mining Boots" + item_path = /obj/item/clothing/shoes/workboots/mining + +/datum/loadout_item/shoes/boots/mining_boots/heeled + name = "Heeled Mining Boots" + item_path = /obj/item/clothing/shoes/workboots/mining/heeled + +/datum/loadout_item/shoes/boots/russian_boots + name = "Russian Boots" + item_path = /obj/item/clothing/shoes/russian + +/datum/loadout_item/shoes/boots/pirate_boots + name = "Pirate Boots" + item_path = /obj/item/clothing/shoes/pirate + +/datum/loadout_item/shoes/boots/work_boots/toeless + name = "Toeless Workboots" + item_path = /obj/item/clothing/shoes/workboots/toeless + +/datum/loadout_item/shoes/boots/noble_boots + name = "Noble Boots" + item_path = /obj/item/clothing/shoes/jackboots/noble + //ckeywhitelist = list("grasshand") + +/* +* COWBOY +*/ + +/datum/loadout_item/shoes/cowboy + group = "Cowboy Boots" + abstract_type = /datum/loadout_item/shoes/cowboy + +/datum/loadout_item/shoes/cowboy/cowboyboots + name = "Cowboy Boots (Brown)" + item_path = /obj/item/clothing/shoes/cowboyboots + +/datum/loadout_item/shoes/cowboy/boots_black + name = "Cowboy Boots (Black)" + item_path = /obj/item/clothing/shoes/cowboyboots/black + + +/* +* LEG WRAPS +*/ + +/datum/loadout_item/shoes/tribal + group = "Tribal Footwear" + abstract_type = /datum/loadout_item/shoes/tribal + +/datum/loadout_item/shoes/tribal/gildedcuffs + name = "Gilded Leg Wraps" + item_path = /obj/item/clothing/shoes/wraps + +/datum/loadout_item/shoes/tribal/silvercuffs + name = "Silver Leg Wraps" + item_path = /obj/item/clothing/shoes/wraps/silver + +/datum/loadout_item/shoes/tribal/redcuffs + name = "Red Leg Wraps" + item_path = /obj/item/clothing/shoes/wraps/red + +/datum/loadout_item/shoes/tribal/bluecuffs + name = "Blue Leg Wraps" + item_path = /obj/item/clothing/shoes/wraps/blue + +/datum/loadout_item/shoes/tribal/cuffs/colourable + name = "Colourable Leg Wraps" + item_path = /obj/item/clothing/shoes/wraps/colourable + +/datum/loadout_item/shoes/tribal/clothwrap + name = "Colourable Cloth Wraps" + item_path = /obj/item/clothing/shoes/wraps/cloth + +/* +* FORMAL +*/ + +/datum/loadout_item/shoes/formal + group = "Formal Shoes" + abstract_type = /datum/loadout_item/shoes/formal + +/datum/loadout_item/shoes/formal/laceups/recolorable + name = "Laceup Shoes (Recolorable)" + item_path = /obj/item/clothing/shoes/colorable_laceups + +/datum/loadout_item/shoes/formal/dominaheels + name = "Dominant Heels" + item_path = /obj/item/clothing/shoes/latex_heels/domina_heels + erp_item = TRUE + +/datum/loadout_item/shoes/formal/high_heels + name = "High Heels" + item_path = /obj/item/clothing/shoes/high_heels + +/datum/loadout_item/shoes/formal/black_heels + name = "Fancy Heels" + item_path = /obj/item/clothing/shoes/fancy_heels + +/datum/loadout_item/shoes/formal/disco + name = "Green Snakeskin Shoes" + item_path = /obj/item/clothing/shoes/discoshoes + +/datum/loadout_item/shoes/formal/dragheels + name = "Fancy Heels (dragmeme)" + item_path = /obj/item/clothing/shoes/fancy_heels/drag + //ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/shoes/formal/bubber/clown/pink/mute //Less silly = Unrestricted + name = "Pink Heels" + item_path = /obj/item/clothing/shoes/latex_heels/bubber/clussy/mute + +/datum/loadout_item/shoes/formal/latex_heels + name = "Latex Heels" + item_path = /obj/item/clothing/shoes/latex_heels + +//Casual + +/datum/loadout_item/shoes/casual + group = "Casual Shoes" + abstract_type = /datum/loadout_item/shoes/casual + +/datum/loadout_item/shoes/casual/sneakers/black_sneakers + name = "Sneakers (Recolorble)" + item_path = /obj/item/clothing/shoes/sneakers/black + +/datum/loadout_item/shoes/casual/sandals + name = "Sandals" + item_path = /obj/item/clothing/shoes/sandal + +/datum/loadout_item/shoes/casual/sandals/recolorable + name = "Sandals (Recolorble)" + item_path = /obj/item/clothing/shoes/colorable_sandals + +/datum/loadout_item/shoes/casual/sportshoes + name = "Sport Shoes" + item_path = /obj/item/clothing/shoes/sports + +/datum/loadout_item/shoes/casual/rainbow + name = "Rainbow Converse" + item_path = /obj/item/clothing/shoes/sneakers/rainbow + +//Fun +/datum/loadout_item/shoes/fun + group = "Costume and Other Silly Shoes" + abstract_type = /datum/loadout_item/shoes/fun + +/datum/loadout_item/shoes/fun/mikulegging + name = "Starlight Singer Bikini" + item_path = /obj/item/clothing/shoes/sneakers/mikuleggings + //ckeywhitelist = list("grandvegeta") + +/datum/loadout_item/shoes/fun/rollerskates + name = "Roller Skates" + item_path = /obj/item/clothing/shoes/wheelys/rollerskates + +/datum/loadout_item/shoes/fun/jingleshoes + name = "Jester Shoes" + item_path = /obj/item/clothing/shoes/jester_shoes + +/datum/loadout_item/shoes/fun/griffin + name = "Griffon Boots" + item_path = /obj/item/clothing/shoes/griffin + +/datum/loadout_item/shoes/fun/wheely + name = "Wheely-Heels" + item_path = /obj/item/clothing/shoes/wheelys + +/datum/loadout_item/shoes/fun/horseshoes + name = "Horseshoes" + item_path = /obj/item/clothing/shoes/horseshoe + +/datum/loadout_item/shoes/fun/romans + name = "Roman Sandals" + item_path = /obj/item/clothing/shoes/roman + +/datum/loadout_item/shoes/fun/saints + name = "Saints Sneakers" + item_path = /obj/item/clothing/shoes/saints + +/datum/loadout_item/shoes/fun/jackfrost + name = "Frosty Boots" + item_path = /obj/item/clothing/shoes/jackbros + +/* +* SEASONAL +*/ + +/datum/loadout_item/shoes/fun/christmas + name = "Red Christmas Boots" + item_path = /obj/item/clothing/shoes/winterboots/christmas + +/datum/loadout_item/shoes/fun/christmas/green + name = "Green Christmas Boots" + item_path = /obj/item/clothing/shoes/winterboots/christmas/green + + +/* +* JOB-RESTRICTED +*/ + +/datum/loadout_item/shoes/fun/jester + name = "Clown's Jester Shoes" + item_path = /obj/item/clothing/shoes/clown_shoes/jester + restricted_roles = list(JOB_CLOWN) + +/datum/loadout_item/shoes/fun/clown_shoes/pink + name = "Pink Clown Shoes" + item_path = /obj/item/clothing/shoes/clown_shoes/pink + restricted_roles = list(JOB_CLOWN) + +/datum/loadout_item/shoes/fun/britches_shoes + name = "Britches' Shoes" + item_path = /obj/item/clothing/shoes/clown_shoes/britches + restricted_roles = list(JOB_CLOWN) + //ckeywhitelist = list("bloodrite") + +/datum/loadout_item/shoes/fun/bubber/clown/pink/squeak //Unlike the rest, these make noise. Job locked. name = "Pink Clown Heels" item_path = /obj/item/clothing/shoes/clown_shoes/bubber/clussy restricted_roles = list(JOB_CLOWN) -/datum/loadout_item/shoes/bubber/clown/pink/mute //Less silly = Unrestricted - name = "Squeakless Pink Clown Heels" - item_path = /obj/item/clothing/shoes/latex_heels/bubber/clussy/mute - -/datum/loadout_item/shoes/bubber/clown/jester/amazing +/datum/loadout_item/shoes/fun/bubber/clown/jester/amazing name = "Striped Jester Shoes" item_path = /obj/item/clothing/shoes/clown_shoes/bubber/jester restricted_roles = list(JOB_CLOWN) -/datum/loadout_item/shoes/latex_heels - name = "Latex Heels" - item_path = /obj/item/clothing/shoes/latex_heels - -/datum/loadout_item/shoes/pirate_boots - name = "Pirate Boots" - item_path = /obj/item/clothing/shoes/pirate - -/datum/loadout_item/shoes/Wheely_heels - name = "Wheely-Heels" - item_path = /obj/item/clothing/shoes/wheelys - -/datum/loadout_item/shoes/horseshoes - name = "Horseshoes" - item_path = /obj/item/clothing/shoes/horseshoe - -/datum/loadout_item/shoes/diesel_m - name = "Male Diesel Boots" - item_path = /obj/item/clothing/shoes/jackboots/diesel_m - -/datum/loadout_item/shoes/diesel_f - name = "Female Diesel Boots" - item_path = /obj/item/clothing/shoes/jackboots/diesel_f - -/datum/loadout_item/shoes/frontier_colonist - name = "Frontier Boots" - item_path = /obj/item/clothing/shoes/jackboots/frontier_colonist/loadout - -/datum/loadout_item/shoes/jackboots/toeless - name = "Toeless Jackboots" - item_path = /obj/item/clothing/shoes/jackboots/toeless - -/datum/loadout_item/shoes/workboots/toeless - name = "Toeless Workboots" - item_path = /obj/item/clothing/shoes/workboots/toeless diff --git a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm index 029b750b48f..833440c00cb 100644 --- a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm +++ b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm @@ -124,12 +124,12 @@ * SHOES */ -/datum/loadout_item/shoes/lace_heels +/datum/loadout_item/shoes/formal/lace_heels name = "Elegant Heels" item_path = /obj/item/clothing/shoes/heels/drag/lace ckeywhitelist = list("thedragmeme") -/datum/loadout_item/shoes/diver //Donor item for patriot210 +/datum/loadout_item/shoes/boots/diver //Donor item for patriot210 name = "Black Divers Boots" item_path = /obj/item/clothing/shoes/boots/diver //ckeywhitelist = list("sexmaster", "leafydasurvivor") diff --git a/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm b/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm index bbe8751a8bd..0569dc7d956 100644 --- a/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm +++ b/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm @@ -69,8 +69,3 @@ /datum/loadout_item/under/jumpsuit/utility_sec/New() . = ..() restricted_roles |= JOB_SECURITY_MEDIC - -/datum/loadout_item/shoes/rax_armadyne_boots - restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) -//Every other item in this set is role restricted, and it's like they forgot the boots. -//I don't think anyone on Skyrat noticed because this is ckey whitelisted there. diff --git a/tgstation.dme b/tgstation.dme index 5172f2ac0d1..3c540707027 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7157,7 +7157,6 @@ #include "modular_skyrat\master_files\code\modules\loadout\categories\mask.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\neck.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\pocket.dm" -#include "modular_skyrat\master_files\code\modules\loadout\categories\shoes.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\suit.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\toys.dm" #include "modular_skyrat\master_files\code\modules\loadout\categories\uniform.dm"