cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 14:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports various downstream clothes (#9044)

Browse Source 
* Ports various downstream clothes

* Two dresses by schnayy + more fixes

* Standardize loadout selection lists, var tracked cloaks, stray jacket pixels
This commit is contained in:
Cerebulon
2023-05-28 19:52:38 +01:00
committed by GitHub
parent b63eab0702
commit d4134ced6f
37 changed files with 857 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/random/maintenance.dm
View File

@@ -86,6 +86,7 @@ something, make sure it's not in one of the other lists.*/
prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/blue,
prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/red,
prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/yellow,
prob(3);/obj/item/clothing/suit/storage/hooded/toggle/colorable/random,
prob(3);/obj/item/clothing/suit/storage/toggle/brown_jacket,
prob(3);/obj/item/clothing/suit/storage/toggle/leather_jacket,
prob(1);/obj/item/clothing/suit/storage/vest/press,

1
code/game/objects/structures/loot_piles.dm
View File

@@ -180,6 +180,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/clothing/suit/storage/toggle/hoodie/blue,
/obj/item/clothing/suit/storage/toggle/hoodie/red,
/obj/item/clothing/suit/storage/toggle/hoodie/yellow,
/obj/item/clothing/suit/storage/hooded/toggle/colorable/random,
/obj/item/clothing/suit/storage/toggle/brown_jacket,
/obj/item/clothing/suit/storage/toggle/leather_jacket,
/obj/item/clothing/suit/storage/apron,

110
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -157,10 +157,11 @@
/datum/gear/accessory/webbing_vest/New()
..()
var/webbingtype = list()
webbingtype["webbing, brown"] = /obj/item/clothing/accessory/storage/brown_vest
webbingtype["webbing, black"] = /obj/item/clothing/accessory/storage/black_vest
webbingtype["webbing, white"] = /obj/item/clothing/accessory/storage/white_vest
var/list/webbingtype = list(
"webbing, brown" = /obj/item/clothing/accessory/storage/brown_vest,
"webbing, black" = /obj/item/clothing/accessory/storage/black_vest,
"webbing, white" = /obj/item/clothing/accessory/storage/white_vest
)
gear_tweaks += new/datum/gear_tweak/path(webbingtype)
/datum/gear/accessory/webbing_simple
@@ -175,10 +176,11 @@
/datum/gear/accessory/drop_pouches/New()
..()
var/pouchtype = list()
pouchtype["drop pouches, brown"] = /obj/item/clothing/accessory/storage/brown_drop_pouches
pouchtype["drop pouches, black"] = /obj/item/clothing/accessory/storage/black_drop_pouches
pouchtype["drop pouches, white"] = /obj/item/clothing/accessory/storage/white_drop_pouches
var/list/pouchtype = list(
"drop pouches, brown" = /obj/item/clothing/accessory/storage/brown_drop_pouches,
"drop pouches, black" = /obj/item/clothing/accessory/storage/black_drop_pouches,
"drop pouches, white" = /obj/item/clothing/accessory/storage/white_drop_pouches
)
gear_tweaks += new/datum/gear_tweak/path(pouchtype)
/datum/gear/accessory/overalls
@@ -188,9 +190,10 @@
/datum/gear/accessory/overalls/New()
..()
var/overalltype = list()
overalltype["overalls, high-vis stripe"] = /obj/item/clothing/accessory/storage/overalls
overalltype["overalls, brown"] = /obj/item/clothing/accessory/storage/overalls/engineer
var/overalltype = list(
"overalls, high-vis stripe" = /obj/item/clothing/accessory/storage/overalls,
"overalls, brown" = /obj/item/clothing/accessory/storage/overalls/engineer
)
gear_tweaks += new/datum/gear_tweak/path(overalltype)
/datum/gear/accessory/fannypack
@@ -205,6 +208,7 @@
var/obj/item/storage/belt/fannypack/fanny_type = fanny
fannys[initial(fanny_type.name)] = fanny_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys))
/datum/gear/accessory/chaps
display_name = "chaps, brown"
path = /obj/item/clothing/accessory/chaps
@@ -219,10 +223,11 @@
/datum/gear/accessory/hawaii/New()
..()
var/list/shirts = list()
shirts["blue hawaii shirt"] = /obj/item/clothing/accessory/hawaii
shirts["red hawaii shirt"] = /obj/item/clothing/accessory/hawaii/red
shirts["random colored hawaii shirt"] = /obj/item/clothing/accessory/hawaii/random
var/list/shirts = list(
"blue hawaii shirt" = /obj/item/clothing/accessory/hawaii,
"red hawaii shirt" = /obj/item/clothing/accessory/hawaii/red,
"random colored hawaii shirt" = /obj/item/clothing/accessory/hawaii/random
)
gear_tweaks += new/datum/gear_tweak/path(shirts)
/datum/gear/accessory/sweater
@@ -245,19 +250,20 @@
/datum/gear/accessory/bracelet/material/New()
..()
var/bracelettype = list()
bracelettype["bracelet, steel"] = /obj/item/clothing/accessory/bracelet/material/steel
bracelettype["bracelet, iron"] = /obj/item/clothing/accessory/bracelet/material/iron
bracelettype["bracelet, silver"] = /obj/item/clothing/accessory/bracelet/material/silver
bracelettype["bracelet, gold"] = /obj/item/clothing/accessory/bracelet/material/gold
bracelettype["bracelet, platinum"] = /obj/item/clothing/accessory/bracelet/material/platinum
bracelettype["bracelet, glass"] = /obj/item/clothing/accessory/bracelet/material/glass
bracelettype["bracelet, wood"] = /obj/item/clothing/accessory/bracelet/material/wood
bracelettype["bracelet, sivian wood"] = /obj/item/clothing/accessory/bracelet/material/sifwood
bracelettype["bracelet, plastic"] = /obj/item/clothing/accessory/bracelet/material/plastic
bracelettype["bracelet, copper"] = /obj/item/clothing/accessory/bracelet/material/copper
bracelettype["bracelet, bronze"] = /obj/item/clothing/accessory/bracelet/material/bronze
bracelettype["bracelet, friendship"] = /obj/item/clothing/accessory/bracelet/friendship
var/list/bracelettype = list(
"bracelet, steel" = /obj/item/clothing/accessory/bracelet/material/steel,
"bracelet, iron" = /obj/item/clothing/accessory/bracelet/material/iron,
"bracelet, silver" = /obj/item/clothing/accessory/bracelet/material/silver,
"bracelet, gold" = /obj/item/clothing/accessory/bracelet/material/gold,
"bracelet, platinum" = /obj/item/clothing/accessory/bracelet/material/platinum,
"bracelet, glass" = /obj/item/clothing/accessory/bracelet/material/glass,
"bracelet, wood" = /obj/item/clothing/accessory/bracelet/material/wood,
"bracelet, sivian wood" = /obj/item/clothing/accessory/bracelet/material/sifwood,
"bracelet, plastic" = /obj/item/clothing/accessory/bracelet/material/plastic,
"bracelet, copper" = /obj/item/clothing/accessory/bracelet/material/copper,
"bracelet, bronze" = /obj/item/clothing/accessory/bracelet/material/bronze,
"bracelet, friendship" = /obj/item/clothing/accessory/bracelet/friendship
)
gear_tweaks += new/datum/gear_tweak/path(bracelettype)
/datum/gear/accessory/bracelet/slap
@@ -289,6 +295,8 @@
display_name = "cape, full"
path = /obj/item/clothing/accessory/fullcape
/datum/gear/accessory/sash
display_name = "sash (colorable)"
path = /obj/item/clothing/accessory/sash
@@ -367,18 +375,19 @@
/datum/gear/accessory/necklace/New()
..()
var/necklacetype = list()
necklacetype["necklace, steel"] = /obj/item/clothing/accessory/necklace/steel
necklacetype["necklace, iron"] = /obj/item/clothing/accessory/necklace/iron
necklacetype["necklace, silver"] = /obj/item/clothing/accessory/necklace/silver
necklacetype["necklace, gold"] = /obj/item/clothing/accessory/necklace/gold
necklacetype["necklace, platinum"] = /obj/item/clothing/accessory/necklace/platinum
necklacetype["necklace, glass"] = /obj/item/clothing/accessory/necklace/glass
necklacetype["necklace, wood"] = /obj/item/clothing/accessory/necklace/wood
necklacetype["necklace, sivian wood"] = /obj/item/clothing/accessory/necklace/sifwood
necklacetype["necklace, plastic"] = /obj/item/clothing/accessory/necklace/plastic
necklacetype["necklace, copper"] = /obj/item/clothing/accessory/necklace/copper
necklacetype["necklace, bronze"] = /obj/item/clothing/accessory/necklace/bronze
var/list/necklacetype = list(
"necklace, steel" = /obj/item/clothing/accessory/necklace/steel,
"necklace, iron" = /obj/item/clothing/accessory/necklace/iron,
"necklace, silver" = /obj/item/clothing/accessory/necklace/silver,
"necklace, gold" = /obj/item/clothing/accessory/necklace/gold,
"necklace, platinum" = /obj/item/clothing/accessory/necklace/platinum,
"necklace, glass" = /obj/item/clothing/accessory/necklace/glass,
"necklace, wood" = /obj/item/clothing/accessory/necklace/wood,
"necklace, sivian wood" = /obj/item/clothing/accessory/necklace/sifwood,
"necklace, plastic" = /obj/item/clothing/accessory/necklace/plastic,
"necklace, copper" = /obj/item/clothing/accessory/necklace/copper,
"necklace, bronze" = /obj/item/clothing/accessory/necklace/bronze
)
gear_tweaks += new/datum/gear_tweak/path(necklacetype)
/datum/gear/accessory/neckerchief/New()
@@ -393,10 +402,19 @@
/datum/gear/accessory/watch/New()
..()
var/watchtype = list()
watchtype["watch"] = /obj/item/clothing/accessory/watch
watchtype["watch, silver"] = /obj/item/clothing/accessory/watch/silver
watchtype["watch, gold"] = /obj/item/clothing/accessory/watch/gold
watchtype["watch, holographic"] = /obj/item/clothing/accessory/watch/holo
watchtype["watch, leather"] = /obj/item/clothing/accessory/watch/leather
var/list/watchtype = list(
"watch" = /obj/item/clothing/accessory/watch,
"watch, silver" = /obj/item/clothing/accessory/watch/silver,
"watch, gold" = /obj/item/clothing/accessory/watch/gold,
"watch, holographic" = /obj/item/clothing/accessory/watch/holo,
"watch, leather" = /obj/item/clothing/accessory/watch/leather
)
gear_tweaks += new/datum/gear_tweak/path(watchtype)
/datum/gear/accessory/ceremonial_bracers
display_name = "ceremonial bracers"
path = /obj/item/clothing/accessory/ceremonial_bracers
/datum/gear/accessory/ceremonial_loins
display_name = "ceremonial loincloth"
path = /obj/item/clothing/accessory/ceremonial_loins

28
code/modules/client/preference_setup/loadout/loadout_contraband.dm
View File

@@ -13,13 +13,14 @@
/datum/gear/contraband/pills/New()
..()
var/drug_type = list()
drug_type["Bliss"] = /obj/item/storage/pill_bottle/bliss
drug_type["Snowflake"] = /obj/item/storage/pill_bottle/snowflake
drug_type["Royale"] = /obj/item/storage/pill_bottle/royale
drug_type["Sinkhole"] = /obj/item/storage/pill_bottle/sinkhole
drug_type["Colorspace"] = /obj/item/storage/pill_bottle/colorspace
drug_type["Schnappi"] = /obj/item/storage/pill_bottle/schnappi
var/list/drug_type = list(
"Bliss" = /obj/item/storage/pill_bottle/bliss,
"Snowflake" = /obj/item/storage/pill_bottle/snowflake,
"Royale" = /obj/item/storage/pill_bottle/royale,
"Sinkhole" = /obj/item/storage/pill_bottle/sinkhole,
"Colorspace" = /obj/item/storage/pill_bottle/colorspace,
"Schnappi" = /obj/item/storage/pill_bottle/schnappi
)
gear_tweaks += new/datum/gear_tweak/path(drug_type)
/datum/gear/contraband/rollingpaper
@@ -54,12 +55,13 @@
/datum/gear/contraband/knives/New()
..()
var/knife = list()
knife["boot knife"] = /obj/item/material/knife/tacknife/boot
knife["butterfly knife"] = /obj/item/material/butterfly
knife["switchblade"] = /obj/item/material/butterfly/switchblade
knife["boxcutter"] = /obj/item/material/butterfly/boxcutter
knife["survival knife"] = /obj/item/material/knife/tacknife/survival
var/list/knife = list(
"boot knife" = /obj/item/material/knife/tacknife/boot,
"butterfly knife" = /obj/item/material/butterfly,
"switchblade" = /obj/item/material/butterfly/switchblade,
"boxcutter" = /obj/item/material/butterfly/boxcutter,
"survival knife" = /obj/item/material/knife/tacknife/survival
)
gear_tweaks += new/datum/gear_tweak/path(knife)
/datum/gear/contraband/zipgun

48
code/modules/client/preference_setup/loadout/loadout_ears.dm
View File

@@ -21,24 +21,25 @@
/datum/gear/ears/earrings/New()
..()
var/earrings = list()
earrings["stud, pearl"] = /obj/item/clothing/ears/earring/stud
earrings["stud, glass"] = /obj/item/clothing/ears/earring/stud/glass
earrings["stud, wood"] = /obj/item/clothing/ears/earring/stud/wood
earrings["stud, iron"] = /obj/item/clothing/ears/earring/stud/iron
earrings["stud, steel"] = /obj/item/clothing/ears/earring/stud/steel
earrings["stud, silver"] = /obj/item/clothing/ears/earring/stud/silver
earrings["stud, gold"] = /obj/item/clothing/ears/earring/stud/gold
earrings["stud, platinum"] = /obj/item/clothing/ears/earring/stud/platinum
earrings["stud, diamond"] = /obj/item/clothing/ears/earring/stud/diamond
earrings["dangle, glass"] = /obj/item/clothing/ears/earring/dangle/glass
earrings["dangle, wood"] = /obj/item/clothing/ears/earring/dangle/wood
earrings["dangle, iron"] = /obj/item/clothing/ears/earring/dangle/iron
earrings["dangle, steel"] = /obj/item/clothing/ears/earring/dangle/steel
earrings["dangle, silver"] = /obj/item/clothing/ears/earring/dangle/silver
earrings["dangle, gold"] = /obj/item/clothing/ears/earring/dangle/gold
earrings["dangle, platinum"] = /obj/item/clothing/ears/earring/dangle/platinum
earrings["dangle, diamond"] = /obj/item/clothing/ears/earring/dangle/diamond
var/list/earrings = list(
"stud, pearl" = /obj/item/clothing/ears/earring/stud,
"stud, glass" = /obj/item/clothing/ears/earring/stud/glass,
"stud, wood" = /obj/item/clothing/ears/earring/stud/wood,
"stud, iron" = /obj/item/clothing/ears/earring/stud/iron,
"stud, steel" = /obj/item/clothing/ears/earring/stud/steel,
"stud, silver" = /obj/item/clothing/ears/earring/stud/silver,
"stud, gold" = /obj/item/clothing/ears/earring/stud/gold,
"stud, platinum" = /obj/item/clothing/ears/earring/stud/platinum,
"stud, diamond" = /obj/item/clothing/ears/earring/stud/diamond,
"dangle, glass" = /obj/item/clothing/ears/earring/dangle/glass,
"dangle, wood" = /obj/item/clothing/ears/earring/dangle/wood,
"dangle, iron" = /obj/item/clothing/ears/earring/dangle/iron,
"dangle, steel" = /obj/item/clothing/ears/earring/dangle/steel,
"dangle, silver" = /obj/item/clothing/ears/earring/dangle/silver,
"dangle, gold" = /obj/item/clothing/ears/earring/dangle/gold,
"dangle, platinum" = /obj/item/clothing/ears/earring/dangle/platinum,
"dangle, diamond" = /obj/item/clothing/ears/earring/dangle/diamond
)
gear_tweaks += new/datum/gear_tweak/path(earrings)
/datum/gear/ears/hearingaid
@@ -48,9 +49,10 @@
/datum/gear/ears/hearingaid/New()
..()
var/hearingaids = list()
hearingaids["hearing aid"] = /obj/item/clothing/ears/hearingaid
hearingaids["black hearing aid"] = /obj/item/clothing/ears/hearingaid/black
hearingaids["silver hearing aid"] = /obj/item/clothing/ears/hearingaid/silver
hearingaids["white hearing aid"] = /obj/item/clothing/ears/hearingaid/white
var/list/hearingaids = list(
"hearing aid" = /obj/item/clothing/ears/hearingaid,
"black hearing aid" = /obj/item/clothing/ears/hearingaid/black,
"silver hearing aid" = /obj/item/clothing/ears/hearingaid/silver,
"white hearing aid" = /obj/item/clothing/ears/hearingaid/white
)
gear_tweaks += new/datum/gear_tweak/path(hearingaids)

48
code/modules/client/preference_setup/loadout/loadout_eyes.dm
View File

@@ -42,11 +42,12 @@
/datum/gear/eyes/glasses/New()
..()
var/glassestype = list()
glassestype["prescription glasses, standard"] = /obj/item/clothing/glasses/regular
glassestype["prescription glasses, hipster"] = /obj/item/clothing/glasses/regular/hipster
glassestype["prescription glasses, rimless"] = /obj/item/clothing/glasses/regular/rimless
glassestype["prescription glasses, thin frame"] = /obj/item/clothing/glasses/regular/thin
var/list/glassestype = list(
"prescription glasses, standard" = /obj/item/clothing/glasses/regular,
"prescription glasses, hipster" = /obj/item/clothing/glasses/regular/hipster,
"prescription glasses, rimless" = /obj/item/clothing/glasses/regular/rimless,
"prescription glasses, thin frame" = /obj/item/clothing/glasses/regular/thin
)
gear_tweaks += new/datum/gear_tweak/path(glassestype)
/datum/gear/eyes/glassesfake
@@ -56,10 +57,11 @@
/datum/gear/eyes/glassesfake/New()
..()
var/glassestype = list()
glassestype["glasses, green"] = /obj/item/clothing/glasses/gglasses
glassestype["glasses, rimless"] = /obj/item/clothing/glasses/rimless
glassestype["glasses, thin frame"] = /obj/item/clothing/glasses/thin
var/list/glassestype = list(
"glasses, green" = /obj/item/clothing/glasses/gglasses,
"glasses, rimless" = /obj/item/clothing/glasses/rimless,
"glasses, thin frame" = /obj/item/clothing/glasses/thin
)
gear_tweaks += new/datum/gear_tweak/path(glassestype)
/datum/gear/eyes/monocle
@@ -85,14 +87,14 @@
/datum/gear/eyes/security/New()
..()
var/hudtype = list()
hudtype["security hud, standard"] = /obj/item/clothing/glasses/hud/security
hudtype["security hud, standard prescription"] = /obj/item/clothing/glasses/hud/security/prescription
hudtype["security hud, sunglasses"] = /obj/item/clothing/glasses/sunglasses/sechud
hudtype["security hud, sunglasses prescription"] = /obj/item/clothing/glasses/sunglasses/sechud/prescription
hudtype["security hud, aviators"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator
hudtype["security hud, aviators prescription"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription
var/list/hudtype = list(
"security hud, standard" = /obj/item/clothing/glasses/hud/security,
"security hud, standard prescription" = /obj/item/clothing/glasses/hud/security/prescription,
"security hud, sunglasses" = /obj/item/clothing/glasses/sunglasses/sechud,
"security hud, sunglasses prescription" = /obj/item/clothing/glasses/sunglasses/sechud/prescription,
"security hud, aviators" = /obj/item/clothing/glasses/sunglasses/sechud/aviator,
"security hud, aviators prescription" = /obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription
)
gear_tweaks += new/datum/gear_tweak/path(hudtype)
/datum/gear/eyes/medical
@@ -145,12 +147,12 @@
/datum/gear/eyes/sun/New()
..()
var/hudtype = list()
hudtype["sunglasses, standard"] = /obj/item/clothing/glasses/sunglasses
hudtype["sunglasses, big"] = /obj/item/clothing/glasses/sunglasses/big
hudtype["sunglasses, aviators"] = /obj/item/clothing/glasses/sunglasses/aviator
hudtype["sunglasses, prescription"] = /obj/item/clothing/glasses/sunglasses/prescription
var/list/hudtype = list(
"sunglasses, standard" = /obj/item/clothing/glasses/sunglasses,
"sunglasses, big" = /obj/item/clothing/glasses/sunglasses/big,
"sunglasses, aviators" = /obj/item/clothing/glasses/sunglasses/aviator,
"sunglasses, prescription" = /obj/item/clothing/glasses/sunglasses/prescription
)
gear_tweaks += new/datum/gear_tweak/path(hudtype)
/datum/gear/eyes/circuitry

101
code/modules/client/preference_setup/loadout/loadout_general.dm
View File

@@ -4,13 +4,14 @@
/datum/gear/cane/New()
..()
var/canetype = list()
canetype["walking cane"] = /obj/item/cane
canetype["telescopic walking cane"] = /obj/item/cane/telescopic
canetype["white cane"] = /obj/item/cane/white
canetype["telescopic white cane"] = /obj/item/cane/white/collapsible
canetype["folding white cane"] = /obj/item/cane/white/collapsible/folding
canetype["crutch"] = /obj/item/cane/crutch
var/list/canetype = list(
"walking cane" = /obj/item/cane,
"telescopic walking cane" = /obj/item/cane/telescopic,
"white cane" = /obj/item/cane/white,
"telescopic white cane" = /obj/item/cane/white/collapsible,
"folding white cane" = /obj/item/cane/white/collapsible/folding,
"crutch" = /obj/item/cane/crutch
)
gear_tweaks += new/datum/gear_tweak/path(canetype)
/datum/gear/dice
@@ -73,13 +74,14 @@
/datum/gear/toy/New()
..()
var/toytype = list()
toytype["Blink toy"] = /obj/item/toy/blink
toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy
toytype["Water flower"] = /obj/item/reagent_containers/spray/waterflower
toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle
toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball
toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch
var/list/toytype = list(
"blink toy" = /obj/item/toy/blink,
"gravitational singularity" = /obj/item/toy/spinningtoy,
"water flower" = /obj/item/reagent_containers/spray/waterflower,
"bosun's whistle" = /obj/item/toy/bosunwhistle,
"magic 8 ball" = /obj/item/toy/eight_ball,
"magic conch shell" = /obj/item/toy/eight_ball/conch
)
gear_tweaks += new/datum/gear_tweak/path(toytype)
@@ -123,41 +125,42 @@
/datum/gear/coffeemug/New()
..()
var/list/coffeemugs = list()
coffeemugs["plain coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug
coffeemugs["SCG coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/sol
coffeemugs["Fleet coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fleet
coffeemugs["Five Arrows coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fivearrows
coffeemugs["Pearlshield coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/psc
coffeemugs["Almach Association coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/alma
coffeemugs["Almach Protectorate coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/almp
coffeemugs["NT coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/nt
coffeemugs["Wulf Aeronautics mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf
coffeemugs["Gilthari Exports coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/gilthari
coffeemugs["Zeng-Hu coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/zeng
coffeemugs["Ward-Takahashi coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/wt
coffeemugs["Aether Atmospherics coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/aether
coffeemugs["Bishop Cybernetics coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/bishop
coffeemugs["Oculum Broadcast coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/oculum
coffeemugs["#1 coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/one
coffeemugs["#1 monkey coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/puni
coffeemugs["heart coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/heart
coffeemugs["pawn coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/pawn
coffeemugs["diona coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/diona
coffeemugs["british coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/britcup
coffeemugs["NCS Northern Star coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tourist
coffeemugs["flame coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/flame
coffeemugs["blue coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/blue
coffeemugs["black coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/black
coffeemugs["green coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green
coffeemugs["dark green coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green/dark
coffeemugs["rainbow coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/rainbow
coffeemugs["metal coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal
coffeemugs["glass coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/glass
coffeemugs["tall coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall
coffeemugs["tall black coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/black
coffeemugs["tall metal coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/metal
coffeemugs["tall rainbow coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow
var/list/coffeemugs = list(
"plain coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug,
"SCG coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/sol,
"Fleet coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fleet,
"Five Arrows coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fivearrows,
"Pearlshield coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/psc,
"Almach Association coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/alma,
"Almach Protectorate coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/almp,
"NT coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/nt,
"Wulf Aeronautics mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf,
"Gilthari Exports coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/gilthari,
"Zeng-Hu coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/zeng,
"Ward-Takahashi coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/wt,
"Aether Atmospherics coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/aether,
"Bishop Cybernetics coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/bishop,
"Oculum Broadcast coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/oculum,
"#1 coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/one,
"#1 monkey coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/puni,
"heart coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/heart,
"pawn coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/pawn,
"diona coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/diona,
"british coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/britcup,
"NCS Northern Star coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tourist,
"flame coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/flame,
"blue coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/blue,
"black coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/black,
"green coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green,
"dark green coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green/dark,
"rainbow coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/rainbow,
"metal coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal,
"glass coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/glass,
"tall coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall,
"tall black coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/black,
"tall metal coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/metal,
"tall rainbow coffee mug" = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow
)
gear_tweaks += new /datum/gear_tweak/path(coffeemugs)
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents())

59
code/modules/client/preference_setup/loadout/loadout_gloves.dm
View File

@@ -13,18 +13,19 @@
/datum/gear/gloves/color/New()
..()
var/glovetype = list()
glovetype["gloves, black"] = /obj/item/clothing/gloves/black
glovetype["gloves, blue"] = path = /obj/item/clothing/gloves/blue
glovetype["gloves, brown"] = /obj/item/clothing/gloves/brown
glovetype["gloves, light-brown"] = /obj/item/clothing/gloves/light_brown
glovetype["gloves, green"] = /obj/item/clothing/gloves/green
glovetype["gloves, grey"] = /obj/item/clothing/gloves/grey
glovetype["gloves, orange"] = /obj/item/clothing/gloves/orange
glovetype["gloves, purple"] = /obj/item/clothing/gloves/purple
glovetype["gloves, rainbow"] = /obj/item/clothing/gloves/rainbow
glovetype["gloves, red"] = /obj/item/clothing/gloves/red
glovetype["gloves, white"] = /obj/item/clothing/gloves/white
var/list/glovetype = list(
"gloves, black" = /obj/item/clothing/gloves/black,
"gloves, blue" = path = /obj/item/clothing/gloves/blue,
"gloves, brown" = /obj/item/clothing/gloves/brown,
"gloves, light-brown" = /obj/item/clothing/gloves/light_brown,
"gloves, green" = /obj/item/clothing/gloves/green,
"gloves, grey" = /obj/item/clothing/gloves/grey,
"gloves, orange" = /obj/item/clothing/gloves/orange,
"gloves, purple" = /obj/item/clothing/gloves/purple,
"gloves, rainbow" = /obj/item/clothing/gloves/rainbow,
"gloves, red" = /obj/item/clothing/gloves/red,
"gloves, white" = /obj/item/clothing/gloves/white
)
gear_tweaks += new/datum/gear_tweak/path(glovetype)
/datum/gear/gloves/latex
@@ -73,23 +74,23 @@
/datum/gear/gloves/ring/New()
..()
var/ringtype = list()
ringtype["CTI ring"] = /obj/item/clothing/gloves/ring/cti
ringtype["Mariner University ring"] = /obj/item/clothing/gloves/ring/mariner
ringtype["engagement ring"] = /obj/item/clothing/gloves/ring/engagement
ringtype["signet ring"] = /obj/item/clothing/gloves/ring/seal/signet
ringtype["masonic ring"] = /obj/item/clothing/gloves/ring/seal/mason
ringtype["ring, glass"] = /obj/item/clothing/gloves/ring/material/glass
ringtype["ring, wood"] = /obj/item/clothing/gloves/ring/material/wood
ringtype["ring, plastic"] = /obj/item/clothing/gloves/ring/material/plastic
ringtype["ring, iron"] = /obj/item/clothing/gloves/ring/material/iron
ringtype["ring, bronze"] = /obj/item/clothing/gloves/ring/material/bronze
ringtype["ring, steel"] = /obj/item/clothing/gloves/ring/material/steel
ringtype["ring, copper"] = /obj/item/clothing/gloves/ring/material/copper
ringtype["ring, silver"] = /obj/item/clothing/gloves/ring/material/silver
ringtype["ring, gold"] = /obj/item/clothing/gloves/ring/material/gold
ringtype["ring, platinum"] = /obj/item/clothing/gloves/ring/material/platinum
var/list/ringtype = list(
"CTI ring" = /obj/item/clothing/gloves/ring/cti,
"Mariner University ring" = /obj/item/clothing/gloves/ring/mariner,
"engagement ring" = /obj/item/clothing/gloves/ring/engagement,
"signet ring" = /obj/item/clothing/gloves/ring/seal/signet,
"masonic ring" = /obj/item/clothing/gloves/ring/seal/mason,
"ring, glass" = /obj/item/clothing/gloves/ring/material/glass,
"ring, wood" = /obj/item/clothing/gloves/ring/material/wood,
"ring, plastic" = /obj/item/clothing/gloves/ring/material/plastic,
"ring, iron" = /obj/item/clothing/gloves/ring/material/iron,
"ring, bronze" = /obj/item/clothing/gloves/ring/material/bronze,
"ring, steel" = /obj/item/clothing/gloves/ring/material/steel,
"ring, copper" = /obj/item/clothing/gloves/ring/material/copper,
"ring, silver" = /obj/item/clothing/gloves/ring/material/silver,
"ring, gold" = /obj/item/clothing/gloves/ring/material/gold,
"ring, platinum" = /obj/item/clothing/gloves/ring/material/platinum
)
gear_tweaks += new/datum/gear_tweak/path(ringtype)
/datum/gear/gloves/circuitry

75
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -11,10 +11,11 @@
/datum/gear/head/bandanas/New()
..()
var/bandanatype = list()
bandanatype["bandana, pirate-red"] = /obj/item/clothing/head/bandana
bandanatype["bandana, green"] = /obj/item/clothing/head/greenbandana
bandanatype["bandana, orange"] = /obj/item/clothing/head/orangebandana
var/list/bandanatype = list(
"bandana, pirate-red" = /obj/item/clothing/head/bandana,
"bandana, green" = /obj/item/clothing/head/greenbandana,
"bandana, orange" = /obj/item/clothing/head/orangebandana
)
gear_tweaks += new/datum/gear_tweak/path(bandanatype)
/datum/gear/head/beret
@@ -23,10 +24,11 @@
/datum/gear/head/beret/New()
..()
var/berettype = list()
berettype["beret, engineering orange"] = /obj/item/clothing/head/beret/engineering
berettype["beret, purple"] = /obj/item/clothing/head/beret/purple
berettype["beret, red"] = /obj/item/clothing/head/beret
var/berettype = list(
"beret, engineering orange" = /obj/item/clothing/head/beret/engineering,
"beret, purple" = /obj/item/clothing/head/beret/purple,
"beret, red" = /obj/item/clothing/head/beret
)
gear_tweaks += new/datum/gear_tweak/path(berettype)
/datum/gear/head/beretsec
@@ -36,14 +38,15 @@
/datum/gear/head/beretsec/New()
..()
var/berettype = list()
berettype["officer beret, navy"] = /obj/item/clothing/head/beret/sec/navy/officer
berettype["officer beret, corporate"] = /obj/item/clothing/head/beret/sec/corporate/officer
berettype["officer beret, red"] = /obj/item/clothing/head/beret/sec
berettype["HoS beret, navy"] = /obj/item/clothing/head/beret/sec/navy/hos
berettype["HoS beret, corporate"] = /obj/item/clothing/head/beret/sec/corporate/hos
berettype["warden beret, navy"] = /obj/item/clothing/head/beret/sec/navy/warden
berettype["warden beret, corporate"] = /obj/item/clothing/head/beret/sec/corporate/warden
var/berettype = list(
"officer beret, navy" = /obj/item/clothing/head/beret/sec/navy/officer,
"officer beret, corporate" = /obj/item/clothing/head/beret/sec/corporate/officer,
"officer beret, red" = /obj/item/clothing/head/beret/sec,
"HoS beret, navy" = /obj/item/clothing/head/beret/sec/navy/hos,
"HoS beret, corporate" = /obj/item/clothing/head/beret/sec/corporate/hos,
"warden beret, navy" = /obj/item/clothing/head/beret/sec/navy/warden,
"warden beret, corporate" = /obj/item/clothing/head/beret/sec/corporate/warden
)
gear_tweaks += new/datum/gear_tweak/path(berettype)
/datum/gear/head/cap
@@ -52,19 +55,20 @@
/datum/gear/head/cap/New()
..()
var/captype = list()
captype["soft cap, black"] = /obj/item/clothing/head/soft/black
captype["soft cap, blue"] = /obj/item/clothing/head/soft/blue
captype["soft cap, green"] = /obj/item/clothing/head/soft/green
captype["soft cap, grey"] = /obj/item/clothing/head/soft/grey
captype["soft cap, major bill's"] = /obj/item/clothing/head/soft/mbill
captype["soft cap, orange"] = /obj/item/clothing/head/soft/orange
captype["soft cap, purple"] = /obj/item/clothing/head/soft/purple
captype["soft cap, rainbow"] = /obj/item/clothing/head/soft/rainbow
captype["soft cap, red"] = /obj/item/clothing/head/soft/red
captype["soft cap, solgov"] = /obj/item/clothing/head/soft/solgov
captype["soft cap, white"] = /obj/item/clothing/head/soft/mime
captype["soft cap, yellow"] = /obj/item/clothing/head/soft/yellow
var/list/captype = list(
"soft cap, black" = /obj/item/clothing/head/soft/black,
"soft cap, blue" = /obj/item/clothing/head/soft/blue,
"soft cap, green" = /obj/item/clothing/head/soft/green,
"soft cap, grey" = /obj/item/clothing/head/soft/grey,
"soft cap, major bill's" = /obj/item/clothing/head/soft/mbill,
"soft cap, orange" = /obj/item/clothing/head/soft/orange,
"soft cap, purple" = /obj/item/clothing/head/soft/purple,
"soft cap, rainbow" = /obj/item/clothing/head/soft/rainbow,
"soft cap, red" = /obj/item/clothing/head/soft/red,
"soft cap, solgov" = /obj/item/clothing/head/soft/solgov,
"soft cap, white" = /obj/item/clothing/head/soft/mime,
"soft cap, yellow" = /obj/item/clothing/head/soft/yellow
)
gear_tweaks += new/datum/gear_tweak/path(captype)
/datum/gear/head/sec_cap
@@ -316,12 +320,13 @@
/datum/gear/head/surgery/New()
..()
var/cap_type = list()
cap_type["Purple cap"] = /obj/item/clothing/head/surgery/purple
cap_type["Blue cap"] = /obj/item/clothing/head/surgery/blue
cap_type["Green cap"] = /obj/item/clothing/head/surgery/green
cap_type["Black cap"] = /obj/item/clothing/head/surgery/black
cap_type["Navy cap"] = /obj/item/clothing/head/surgery/navyblue
var/list/cap_type = list(
"purple cap" = /obj/item/clothing/head/surgery/purple,
"blue cap" = /obj/item/clothing/head/surgery/blue,
"green cap" = /obj/item/clothing/head/surgery/green,
"black cap" = /obj/item/clothing/head/surgery/black,
"navy cap" = /obj/item/clothing/head/surgery/navyblue
)
gear_tweaks += new/datum/gear_tweak/path(cap_type)
/datum/gear/head/hairnet

54
code/modules/client/preference_setup/loadout/loadout_shoes.dm
View File

@@ -37,18 +37,18 @@
/datum/gear/shoes/colored/New()
..()
var/shoetype = list()
shoetype["shoes, black"] = /obj/item/clothing/shoes/black
shoetype["shoes, blue"] = /obj/item/clothing/shoes/blue
shoetype["shoes, brown"] = /obj/item/clothing/shoes/brown
shoetype["shoes, green"] = /obj/item/clothing/shoes/green
shoetype["shoes, orange"] = /obj/item/clothing/shoes/orange
shoetype["shoes, purple"] = /obj/item/clothing/shoes/purple
shoetype["shoes, rainbow"] = /obj/item/clothing/shoes/rainbow
shoetype["shoes, red"] = /obj/item/clothing/shoes/red
shoetype["shoes, white"] = /obj/item/clothing/shoes/white
shoetype["shoes, yellow"] = /obj/item/clothing/shoes/yellow
var/list/shoetype = list(
"shoes, black" = /obj/item/clothing/shoes/black,
"shoes, blue" = /obj/item/clothing/shoes/blue,
"shoes, brown" = /obj/item/clothing/shoes/brown,
"shoes, green" = /obj/item/clothing/shoes/green,
"shoes, orange" = /obj/item/clothing/shoes/orange,
"shoes, purple" = /obj/item/clothing/shoes/purple,
"shoes, rainbow" = /obj/item/clothing/shoes/rainbow,
"shoes, red" = /obj/item/clothing/shoes/red,
"shoes, white" = /obj/item/clothing/shoes/white,
"shoes, yellow" = /obj/item/clothing/shoes/yellow
)
gear_tweaks += new/datum/gear_tweak/path(shoetype)
/datum/gear/shoes/lacey
@@ -107,6 +107,10 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/shoes/flats/alt
display_name = "shoes, flats alt (colorable)"
path = /obj/item/clothing/shoes/flats/white/color/alt
/datum/gear/shoes/cowboy
display_name = "boots, cowboy selection"
path = /obj/item/clothing/shoes/boots/cowboy
@@ -155,18 +159,19 @@
/datum/gear/shoes/winter_boots/New()
..()
var/boottype = list()
boottype["winter boots, atmospherics"] = /obj/item/clothing/shoes/boots/winter/atmos
boottype["winter boots, brown"] = /obj/item/clothing/shoes/boots/winter
boottype["winter boots, engineering"] = /obj/item/clothing/shoes/boots/winter/engineering
boottype["winter boots, hydroponics"] = /obj/item/clothing/shoes/boots/winter/hydro
boottype["winter boots, management"] = /obj/item/clothing/shoes/boots/winter/command
boottype["winter boots, medical"] = /obj/item/clothing/shoes/boots/winter/medical
boottype["winter boots, mining"] = /obj/item/clothing/shoes/boots/winter/mining
boottype["winter boots, science"] = /obj/item/clothing/shoes/boots/winter/science
boottype["winter boots, security"] = /obj/item/clothing/shoes/boots/winter/security
boottype["winter boots, supply"] = /obj/item/clothing/shoes/boots/winter/supply
var/list/boottype = list(
"winter boots, atmospherics" = /obj/item/clothing/shoes/boots/winter/atmos,
"winter boots, brown" = /obj/item/clothing/shoes/boots/winter,
"winter boots, engineering" = /obj/item/clothing/shoes/boots/winter/engineering,
"winter boots, hydroponics" = /obj/item/clothing/shoes/boots/winter/hydro,
"winter boots, management" = /obj/item/clothing/shoes/boots/winter/command,
"winter boots, medical" = /obj/item/clothing/shoes/boots/winter/medical,
"winter boots, mining" = /obj/item/clothing/shoes/boots/winter/mining,
"winter boots, science" = /obj/item/clothing/shoes/boots/winter/science,
"winter boots, security" = /obj/item/clothing/shoes/boots/winter/security,
"winter boots, supply" = /obj/item/clothing/shoes/boots/winter/supply
)
gear_tweaks += new/datum/gear_tweak/path(boottype)
/datum/gear/shoes/circuitry
display_name = "boots, circuitry (empty)"
@@ -180,3 +185,6 @@
/datum/gear/shoes/clogs/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/shoes/ceremonial_guards
display_name = "ceremonial leg guards"
path = /obj/item/clothing/shoes/ceremonial_guards

170
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -40,10 +40,11 @@
/datum/gear/suit/bomber/New()
..()
var/bombertype = list()
bombertype["bomber jacket"] = /obj/item/clothing/suit/storage/toggle/bomber
bombertype["bomber jacket, alternate"] = /obj/item/clothing/suit/storage/bomber/alt
bombertype["bomber jacket, retro"] = /obj/item/clothing/suit/storage/toggle/bomber/retro
var/list/bombertype = list(
"bomber jacket" = /obj/item/clothing/suit/storage/toggle/bomber,
"bomber jacket, alternate" = /obj/item/clothing/suit/storage/bomber/alt,
"bomber jacket, retro" = /obj/item/clothing/suit/storage/toggle/bomber/retro
)
gear_tweaks += new/datum/gear_tweak/path(bombertype)
/datum/gear/suit/leather_jacket
@@ -53,12 +54,13 @@
/datum/gear/suit/leather_jacket/New()
..()
var/ljtype = list()
ljtype["leather jacket, black"] = /obj/item/clothing/suit/storage/toggle/leather_jacket
ljtype["leather jacket, alternate black"] = /obj/item/clothing/suit/storage/leather_jacket_alt
ljtype["leather jacket, corporate black"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen
ljtype["leather jacket, brown"] = /obj/item/clothing/suit/storage/toggle/brown_jacket
ljtype["leather jacket, corporate brown"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
var/ljtype = list(
"leather jacket, black" = /obj/item/clothing/suit/storage/toggle/leather_jacket,
"leather jacket, alternate black" = /obj/item/clothing/suit/storage/leather_jacket_alt,
"leather jacket, corporate black" = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen,
"leather jacket, brown" = /obj/item/clothing/suit/storage/toggle/brown_jacket,
"leather jacket, corporate brown" = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
)
gear_tweaks += new/datum/gear_tweak/path(ljtype)
/datum/gear/suit/leather_vest
@@ -68,11 +70,12 @@
/datum/gear/suit/leather_vest/New()
..()
var/lvtype = list()
lvtype["leather vest, black"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless
lvtype["leather vest, corporate black"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless
lvtype["leather vest, brown"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
lvtype["leather vest, corporate brown"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless
var/list/lvtype = list(
"leather vest, black" = /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless,
"leather vest, corporate black" = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless,
"leather vest, brown" = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless,
"leather vest, corporate brown" = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless
)
gear_tweaks += new/datum/gear_tweak/path(lvtype)
/datum/gear/suit/mil
@@ -99,9 +102,10 @@
/datum/gear/suit/trenchcoat/New()
..()
var/coattype = list()
coattype["trenchcoat, brown"] = /obj/item/clothing/suit/storage/trench
coattype["trenchcoat, grey"] = /obj/item/clothing/suit/storage/trench/grey
var/coattype = list(
"trenchcoat, brown" = /obj/item/clothing/suit/storage/trench,
"trenchcoat, grey" = /obj/item/clothing/suit/storage/trench/grey
)
gear_tweaks += new/datum/gear_tweak/path(coattype)
/datum/gear/suit/duster
@@ -125,8 +129,8 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hazards))
/datum/gear/suit/hoodie
display_name = "hoodie selection"
description = "A selection of hooded sweatshirts."
display_name = "hoodie, baggy selection"
description = "A selection of hooded sweatshirts, with non-functional hoods."
path = /obj/item/clothing/suit/storage/toggle/hoodie
cost = 2
@@ -146,16 +150,17 @@
/datum/gear/suit/labcoat/New()
..()
var/labcoattype = list()
labcoattype["labcoat, white"] = /obj/item/clothing/suit/storage/toggle/labcoat
labcoattype["labcoat, blue"] = /obj/item/clothing/suit/storage/toggle/labcoat/blue
labcoattype["labcoat, blue-edged"] = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge
labcoattype["labcoat, green"] = /obj/item/clothing/suit/storage/toggle/labcoat/green
labcoattype["labcoat, orange"] = /obj/item/clothing/suit/storage/toggle/labcoat/orange
labcoattype["labcoat, pink"] = /obj/item/clothing/suit/storage/toggle/labcoat/pink
labcoattype["labcoat, purple"] = /obj/item/clothing/suit/storage/toggle/labcoat/purple
labcoattype["labcoat, red"] = /obj/item/clothing/suit/storage/toggle/labcoat/red
labcoattype["labcoat, yellow"] = /obj/item/clothing/suit/storage/toggle/labcoat/yellow
var/list/labcoattype = list(
"labcoat, white" = /obj/item/clothing/suit/storage/toggle/labcoat,
"labcoat, blue" = /obj/item/clothing/suit/storage/toggle/labcoat/blue,
"labcoat, blue-edged" = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge,
"labcoat, green" = /obj/item/clothing/suit/storage/toggle/labcoat/green,
"labcoat, orange" = /obj/item/clothing/suit/storage/toggle/labcoat/orange,
"labcoat, pink" = /obj/item/clothing/suit/storage/toggle/labcoat/pink,
"labcoat, purple" = /obj/item/clothing/suit/storage/toggle/labcoat/purple,
"labcoat, red" = /obj/item/clothing/suit/storage/toggle/labcoat/red,
"labcoat, yellow" = /obj/item/clothing/suit/storage/toggle/labcoat/yellow
)
gear_tweaks += new/datum/gear_tweak/path(labcoattype)
/datum/gear/suit/labcoat_rd
@@ -197,7 +202,7 @@
/datum/gear/suit/cloak_department
display_name = "cloak, departmental selection"
description = "A selection of cloaks in departmental colours."
description = "A selection of cloaks and capelets in departmental colours."
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/cargo
/datum/gear/suit/cloak_department/New()
@@ -216,6 +221,57 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/cloak_chaplain
display_name = "cloak, ceremonial selection"
description = "A selection of cloaks typically worn in ceremonial contexts."
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/ceremonial
/datum/gear/suit/cloak_chaplain/New()
..()
var/list/coattype = list(
"cloak, Pleromanist" = /obj/item/clothing/accessory/storage/poncho/roles/cloak/chapel,
"cloak, Unitarian" = /obj/item/clothing/accessory/storage/poncho/roles/cloak/chapel/alt,
"cloak, ceremonial" = /obj/item/clothing/accessory/storage/poncho/roles/cloak/ceremonial
)
gear_tweaks += new/datum/gear_tweak/path(coattype)
//Half cloak
/datum/gear/suit/cloak_half
display_name = "cloak, half, colorable"
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/half
/datum/gear/suit/cloak_half/New()
gear_tweaks += gear_tweak_free_color_choice
//Shoulder cloak
/datum/gear/suit/cloak_shoulder
display_name = "cloak, left shoulder (colorable)"
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/shoulder
/datum/gear/suit/cloak_shoulder/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/cloak_shoulder_right
display_name = "cloak, right shoulder (colorable)"
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/shoulder/right
/datum/gear/suit/cloak_shoulder_right/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/capelet
display_name = "cloak, capelet (colorable)"
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet
/datum/gear/suit/capelet/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/roughcloak
display_name = "cloak, rough (colorable)"
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/half
/datum/gear/suit/roughcloak/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/unathi_robe
display_name = "roughspun robe"
path = /obj/item/clothing/suit/unathi/robe
@@ -227,10 +283,11 @@
/datum/gear/suit/suit_jackets/New()
..()
var/jackettype = list()
jackettype["suit jacket, black"] = /obj/item/clothing/suit/storage/toggle/internalaffairs
jackettype["suit jacket, blue"] = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
jackettype["suit jacket, purple"] = /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket
var/list/jackettype = list(
"suit jacket, black" = /obj/item/clothing/suit/storage/toggle/internalaffairs,
"suit jacket, blue" = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket,
"suit jacket, purple" = /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket
)
gear_tweaks += new/datum/gear_tweak/path(jackettype)
/datum/gear/suit/suspenders
@@ -245,11 +302,12 @@
/datum/gear/suit/forensics/New()
..()
var/jackettype = list()
jackettype["forensics jacket, red long"] = /obj/item/clothing/suit/storage/forensics/red/long
jackettype["forensics jacket, red short"] = /obj/item/clothing/suit/storage/forensics/red
jackettype["forensics jacket, blue long"] = /obj/item/clothing/suit/storage/forensics/blue/long
jackettype["forensics jacket, blue short"] = /obj/item/clothing/suit/storage/forensics/blue
var/list/jackettype = list(
"forensics jacket, red long" = /obj/item/clothing/suit/storage/forensics/red/long,
"forensics jacket, red short" = /obj/item/clothing/suit/storage/forensics/red,
"forensics jacket, blue long" = /obj/item/clothing/suit/storage/forensics/blue/long,
"forensics jacket, blue short" = /obj/item/clothing/suit/storage/forensics/blue
)
gear_tweaks += new/datum/gear_tweak/path(jackettype)
/datum/gear/suit/wintercoat
@@ -333,12 +391,13 @@
/datum/gear/suit/dep_jacket/New()
..()
var/jackettype = list()
jackettype["department jacket, engineering"] = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
jackettype["department jacket, medical"] = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
jackettype["department jacket, security"] = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
jackettype["department jacket, science"] = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
jackettype["department jacket, supply"] = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
var/list/jackettype = list(
"department jacket, engineering" = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket,
"department jacket, medical" = /obj/item/clothing/suit/storage/toggle/med_dep_jacket,
"department jacket, security" = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket,
"department jacket, science" = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket,
"department jacket, supply" = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
)
gear_tweaks += new/datum/gear_tweak/path(jackettype)
/datum/gear/suit/light_jacket
@@ -349,8 +408,8 @@
/datum/gear/suit/light_jacket/New()
..()
var/list/jacket = list(
"grey light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket,
"dark blue light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket/blue
"grey light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket,
"dark blue light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket/blue
)
gear_tweaks += new/datum/gear_tweak/path(jacket)
@@ -400,3 +459,18 @@
var/obj/item/clothing/suit/costume/costume_type = costume
costumes[initial(costume_type.name)] = costume_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))
/datum/gear/suit/choodies
display_name = "hoodie selection (colorable)"
description = "A selection of hoodies with functional hoods."
path = /obj/item/clothing/suit/storage/hooded/toggle/colorable
/datum/gear/suit/choodies/New()
..()
var/list/choodies = list(
"normal hoodie" = /obj/item/clothing/suit/storage/hooded/toggle/colorable,
"sleeveless hoodie" = /obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless,
"cropped hoodie" = /obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += new/datum/gear_tweak/path(choodies)

221
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -46,9 +46,10 @@
/datum/gear/uniform/cuttop/New()
..()
var/cuttoptype = list()
cuttoptype["cut top, grey"] = /obj/item/clothing/under/cuttop
cuttoptype["cut top, red"] = /obj/item/clothing/under/cuttop/red
var/list/cuttoptype = list(
"cut top, grey" = /obj/item/clothing/under/cuttop,
"cut top, red" = /obj/item/clothing/under/cuttop/red
)
gear_tweaks += new/datum/gear_tweak/path(cuttoptype)
/datum/gear/uniform/jumpsuit
@@ -73,21 +74,32 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/uniform/qipao_colorable
display_name = "qipao, selection (colorable)"
path = /obj/item/clothing/under/qipao/colorable
/datum/gear/uniform/qipao_colorable/New()
..()
var/list/qipaos = list(
"qipao, gold trim" = /obj/item/clothing/under/qipao/colorable,
"qipao, slim" = /obj/item/clothing/under/qipao2,
"qipao, short" = /obj/item/clothing/under/qipao
)
gear_tweaks += list(new/datum/gear_tweak/path(qipaos), gear_tweak_free_color_choice)
/datum/gear/uniform/qipao
display_name = "qipao"
path = /obj/item/clothing/under/qipao
display_name = "qipao, pre-colored selection"
description = "Skirts to cover your lower body, in various styles."
path = /obj/item/clothing/under/skirt
/datum/gear/uniform/qipao/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/uniform/qipao2
display_name = "qipao, slim"
path = /obj/item/clothing/under/qipao2
/datum/gear/uniform/qipao2/New()
..()
gear_tweaks += gear_tweak_free_color_choice
var/list/qipaos = list(
"qipao, black" = /obj/item/clothing/under/qipao/black,
"qipao, white" = /obj/item/clothing/under/qipao/white,
"qipao, red" = /obj/item/clothing/under/qipao/red
)
gear_tweaks += new/datum/gear_tweak/path(qipaos)
/datum/gear/uniform/skirt
display_name = "skirt, selection"
@@ -135,16 +147,17 @@
/datum/gear/uniform/job_skirt/New()
..()
var/skirttype = list()
skirttype["skirt, chief engineer"] = /obj/item/clothing/under/rank/chief_engineer/skirt
skirttype["skirt, atmospheric technician"] = /obj/item/clothing/under/rank/atmospheric_technician/skirt
skirttype["skirt, engineer"] = /obj/item/clothing/under/rank/engineer/skirt
skirttype["skirt, roboticist"] = /obj/item/clothing/under/rank/roboticist/skirt
skirttype["skirt, CMO"] = /obj/item/clothing/under/rank/chief_medical_officer/skirt
skirttype["skirt, chemist"] = /obj/item/clothing/under/rank/chemist/skirt
skirttype["skirt, virologist"] = /obj/item/clothing/under/rank/virologist/skirt
skirttype["skirt, medical"] = /obj/item/clothing/under/rank/medical/skirt
skirttype["skirt, scientist"] = /obj/item/clothing/under/rank/scientist/skirt
var/list/skirttype = list(
"skirt, chief engineer" = /obj/item/clothing/under/rank/chief_engineer/skirt,
"skirt, atmospheric technician" = /obj/item/clothing/under/rank/atmospheric_technician/skirt,
"skirt, engineer" = /obj/item/clothing/under/rank/engineer/skirt,
"skirt, roboticist" = /obj/item/clothing/under/rank/roboticist/skirt,
"skirt, CMO" = /obj/item/clothing/under/rank/chief_medical_officer/skirt,
"skirt, chemist" = /obj/item/clothing/under/rank/chemist/skirt,
"skirt, virologist" = /obj/item/clothing/under/rank/virologist/skirt,
"skirt, medical" = /obj/item/clothing/under/rank/medical/skirt,
"skirt, scientist" = /obj/item/clothing/under/rank/scientist/skirt
)
gear_tweaks += new/datum/gear_tweak/path(skirttype)
/datum/gear/uniform/job_turtle
@@ -154,11 +167,12 @@
/datum/gear/uniform/job_turtle/New()
..()
var/turtletype = list()
turtletype["turtleneck, science"] = /obj/item/clothing/under/rank/scientist/turtleneck
turtletype["turtleneck, engineering"] = /obj/item/clothing/under/rank/engineer/turtleneck
turtletype["turtleneck, security"] = /obj/item/clothing/under/rank/security/turtleneck
turtletype["turtleneck, medical"] = /obj/item/clothing/under/rank/medical/turtleneck
var/list/turtletype = list(
"turtleneck, science" = /obj/item/clothing/under/rank/scientist/turtleneck,
"turtleneck, engineering" = /obj/item/clothing/under/rank/engineer/turtleneck,
"turtleneck, security" = /obj/item/clothing/under/rank/security/turtleneck,
"turtleneck, medical" = /obj/item/clothing/under/rank/medical/turtleneck
)
gear_tweaks += new/datum/gear_tweak/path(turtletype)
/datum/gear/uniform/uniform_cargo
@@ -169,11 +183,12 @@
/datum/gear/uniform/uniform_cargo/New()
..()
var/cargotype = list()
cargotype["cargo uniform, shorts"] = /obj/item/clothing/under/rank/cargotech/shorts
cargotype["cargo uniform, jeans"] = /obj/item/clothing/under/rank/cargotech/jeans
cargotype["cargo uniform, feminine jeans"] = /obj/item/clothing/under/rank/cargotech/jeans/female
cargotype["cargo uniform, skirt"] = /obj/item/clothing/under/rank/cargotech/skirt
var/list/cargotype = list(
"cargo uniform, shorts" = /obj/item/clothing/under/rank/cargotech/shorts,
"cargo uniform, jeans" = /obj/item/clothing/under/rank/cargotech/jeans,
"cargo uniform, feminine jeans" = /obj/item/clothing/under/rank/cargotech/jeans/female,
"cargo uniform, skirt" = /obj/item/clothing/under/rank/cargotech/skirt
)
gear_tweaks += new/datum/gear_tweak/path(cargotype)
/datum/gear/uniform/uniform_qm
@@ -184,10 +199,11 @@
/datum/gear/uniform/uniform_qm/New()
..()
var/qmtype = list()
qmtype["quartermaster uniform, jeans"] = /obj/item/clothing/under/rank/cargo/jeans
qmtype["quartermaster uniform, feminine jeans"] = /obj/item/clothing/under/rank/cargo/jeans/female
qmtype["quartermaster uniform, skirt"] = /obj/item/clothing/under/rank/cargo/skirt
var/list/qmtype = list(
"quartermaster uniform, jeans" = /obj/item/clothing/under/rank/cargo/jeans,
"quartermaster uniform, feminine jeans" = /obj/item/clothing/under/rank/cargo/jeans/female,
"quartermaster uniform, skirt" = /obj/item/clothing/under/rank/cargo/skirt
)
gear_tweaks += new/datum/gear_tweak/path(qmtype)
/datum/gear/uniform/old_miner
@@ -263,14 +279,15 @@
/datum/gear/uniform/sundress/New()
..()
var/sdresstype = list()
sdresstype["sundress"] = /obj/item/clothing/under/sundress
sdresstype["sundress, long blue"] = /obj/item/clothing/under/dress/sundress_blue
sdresstype["sundress, pink"] = /obj/item/clothing/under/dress/sundress_pink
sdresstype["sundress, pink with bow"] = /obj/item/clothing/under/dress/sundress_pinkbow
sdresstype["sundress, short pink"] = /obj/item/clothing/under/dress/sundress_pinkshort
sdresstype["sundress, white"] = /obj/item/clothing/under/sundress_white
sdresstype["sundress, white alt"] = /obj/item/clothing/under/dress/sundress_white
var/list/sdresstype = list(
"sundress" = /obj/item/clothing/under/sundress,
"sundress, long blue" = /obj/item/clothing/under/dress/sundress_blue,
"sundress, pink" = /obj/item/clothing/under/dress/sundress_pink,
"sundress, pink with bow" = /obj/item/clothing/under/dress/sundress_pinkbow,
"sundress, short pink" = /obj/item/clothing/under/dress/sundress_pinkshort,
"sundress, white" = /obj/item/clothing/under/sundress_white,
"sundress, white alt" = /obj/item/clothing/under/dress/sundress_white
)
gear_tweaks += new/datum/gear_tweak/path(sdresstype)
/datum/gear/uniform/dress_fire
@@ -290,12 +307,13 @@
/datum/gear/uniform/uniform_security/New()
..()
var/secunitype = list()
secunitype["officer uniform, corporate"] = /obj/item/clothing/under/rank/security/corp
secunitype["officer uniform, navy"] = /obj/item/clothing/under/rank/security/navyblue
secunitype["officer uniform, hedberg-hammarstrom"] = /obj/item/clothing/under/hedberg
secunitype["officer uniform, red skirt"] = /obj/item/clothing/under/rank/security/skirt
secunitype["detective uniform, corporate"] = /obj/item/clothing/under/det/corporate
var/list/secunitype = list(
"officer uniform, corporate" = /obj/item/clothing/under/rank/security/corp,
"officer uniform, navy" = /obj/item/clothing/under/rank/security/navyblue,
"officer uniform, hedberg-hammarstrom" = /obj/item/clothing/under/hedberg,
"officer uniform, red skirt" = /obj/item/clothing/under/rank/security/skirt,
"detective uniform, corporate" = /obj/item/clothing/under/det/corporate
)
gear_tweaks += new/datum/gear_tweak/path(secunitype)
/datum/gear/uniform/uniform_warden
@@ -306,10 +324,11 @@
/datum/gear/uniform/uniform_warden/New()
..()
var/warunitype = list()
warunitype["warden uniform, corporate"] = /obj/item/clothing/under/rank/warden/corp
warunitype["warden uniform, navy"] = /obj/item/clothing/under/rank/warden/navyblue
warunitype["warden uniform, red skirt"] = /obj/item/clothing/under/rank/warden/skirt
var/list/warunitype = list(
"warden uniform, corporate" = /obj/item/clothing/under/rank/warden/corp,
"warden uniform, navy" = /obj/item/clothing/under/rank/warden/navyblue,
"warden uniform, red skirt" = /obj/item/clothing/under/rank/warden/skirt
)
gear_tweaks += new/datum/gear_tweak/path(warunitype)
/datum/gear/uniform/uniform_hos
@@ -320,10 +339,11 @@
/datum/gear/uniform/uniform_hos/New()
..()
var/hosunitype = list()
hosunitype["HoS uniform, corporate"] = /obj/item/clothing/under/rank/head_of_security/corp
hosunitype["HoS uniform, navy"] = /obj/item/clothing/under/rank/head_of_security/navyblue
hosunitype["HoS Uniform, red skirt"] = /obj/item/clothing/under/rank/head_of_security/skirt
var/list/hosunitype = list(
"HoS uniform, corporate" = /obj/item/clothing/under/rank/head_of_security/corp,
"HoS uniform, navy" = /obj/item/clothing/under/rank/head_of_security/navyblue,
"HoS Uniform, red skirt" = /obj/item/clothing/under/rank/head_of_security/skirt
)
gear_tweaks += new/datum/gear_tweak/path(hosunitype)
/datum/gear/uniform/uniform_hop
@@ -334,34 +354,26 @@
/datum/gear/uniform/uniform_hop/New()
..()
var/hopunitype = list()
hopunitype["HoP dress"] = /obj/item/clothing/under/dress/dress_hop
hopunitype["HR director"] = /obj/item/clothing/under/dress/dress_hr
var/list/hopunitype = list(
"HoP dress" = /obj/item/clothing/under/dress/dress_hop,
"HR director" = /obj/item/clothing/under/dress/dress_hr
)
gear_tweaks += new/datum/gear_tweak/path(hopunitype)
/datum/gear/uniform/shortplaindress
display_name = "dress, plain (colorable)"
path = /obj/item/clothing/under/dress/white3
/datum/gear/uniform/shortplaindress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/uniform/longdress
display_name = "dress, long (colorable)"
path = /obj/item/clothing/under/dress/white2
/datum/gear/uniform/longdress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/uniform/longwidedress
display_name = "dress, long and wide (colorable)"
/datum/gear/uniform/dresses_colorable
display_name = "dress, colorable selection"
path = /obj/item/clothing/under/dress/white4
/datum/gear/uniform/longwidedress/New()
/datum/gear/uniform/dresses_colorable/New()
..()
gear_tweaks += gear_tweak_free_color_choice
var/list/dresses = list(
"plain dress" = /obj/item/clothing/under/dress/white3,
"short, sleeveless dress" = /obj/item/clothing/under/dress/little_strapless,
"long, sleeveless dress" = /obj/item/clothing/under/dress/long_strapless,
"long dress" = /obj/item/clothing/under/dress/white2,
"long, wide dress" = /obj/item/clothing/under/dress/white4
)
gear_tweaks += list(new/datum/gear_tweak/path(dresses), gear_tweak_free_color_choice)
/datum/gear/uniform/reddress
display_name = "dress, red with belt"
@@ -376,7 +388,7 @@
path = /obj/item/clothing/under/dress/sailordress
/datum/gear/uniform/dresses/eveninggown
display_name = "evening gown, red"
display_name = "dress, evening gown, red"
path = /obj/item/clothing/under/dress/redeveninggown
/datum/gear/uniform/dresses/maid
@@ -595,7 +607,7 @@
path = /obj/item/clothing/under/cyberpunkpants
/datum/gear/uniform/whitegown
display_name = "white gown"
display_name = "dress, white gown"
path = /obj/item/clothing/under/wedding/whitegown
/datum/gear/uniform/floofdress
@@ -607,7 +619,7 @@
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/uniform/blackngold
display_name = "black and gold gown"
display_name = "dress, black and gold gown"
path = /obj/item/clothing/under/blackngold
/datum/gear/uniform/sheerblue
@@ -663,3 +675,38 @@
var/obj/item/clothing/under/costume/costume_type = costume
costumes[initial(costume_type.name)] = costume_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))
/datum/gear/uniform/ceremonial
display_name = "outfit, ceremonial selection"
path = /obj/item/clothing/under/dress/ceremonial
/datum/gear/uniform/ceremonial/New()
..()
var/list/hopunitype = list(
"ceremonial corset with bodystocking" = /obj/item/clothing/under/dress/ceremonial,
"ceremonial corset without bodystocking" = /obj/item/clothing/under/dress/ceremonial/sheerless
)
gear_tweaks += new/datum/gear_tweak/path(hopunitype)
//Colorable skirts
/datum/gear/uniform/coloredskirts
display_name = "skirt selection, colorable"
path = /obj/item/clothing/under/skirt/colorable
/datum/gear/uniform/coloredskirts/New()
..()
var/list/skirts = list(
"casual skirt" = /obj/item/clothing/under/skirt/colorable,
"puffy skirt" = /obj/item/clothing/under/skirt/colorable/puffy,
"skater skirt" = /obj/item/clothing/under/skirt/colorable/skater,
"pleated skirt" = /obj/item/clothing/under/skirt/colorable/pleated,
"pencil skirt" = /obj/item/clothing/under/skirt/colorable/pencil,
"plaid skirt" = /obj/item/clothing/under/skirt/colorable/plaid,
"tube skirt" = /obj/item/clothing/under/skirt/colorable/tube,
"long skirt" = /obj/item/clothing/under/skirt/colorable/long,
"high skirt" = /obj/item/clothing/under/skirt/colorable/high,
"swept skirt" = /obj/item/clothing/under/skirt/colorable/swept,
"jumper skirt" = /obj/item/clothing/under/skirt/colorable/jumper,
"jumper dress" = /obj/item/clothing/under/skirt/colorable/jumperdress
)
gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)

13
code/modules/client/preference_setup/loadout/loadout_utility.dm
View File

@@ -32,12 +32,13 @@
/datum/gear/utility/communicator/New()
..()
var/commtype = list()
commtype["communicator"] = /obj/item/communicator
commtype["communicator, watch"] = /obj/item/communicator/watch
commtype["communicator, sleek"] = /obj/item/communicator/sleek
commtype["communicator, flip"] = /obj/item/communicator/flip
commtype["communicator, rugged"] = /obj/item/communicator/rugged
var/commtype = list(
"communicator" = /obj/item/communicator,
"communicator, watch" = /obj/item/communicator/watch,
"communicator, sleek" = /obj/item/communicator/sleek,
"communicator, flip" = /obj/item/communicator/flip,
"communicator, rugged" = /obj/item/communicator/rugged
)
gear_tweaks += new/datum/gear_tweak/path(commtype)
/datum/gear/utility/codex

6
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -6,10 +6,14 @@
sort_category = "Xenowear"
/datum/gear/head/zhan_scarf
display_name = "Zhan headscarf"
display_name = "Zhan headscarf (colorable)"
path = /obj/item/clothing/head/tajaran/scarf
whitelisted = SPECIES_TAJ
/datum/gear/head/zhan_scarf/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/unathi_mantle
display_name = "hide mantle (Unathi)"
path = /obj/item/clothing/suit/unathi/mantle

16
code/modules/clothing/head/hood.dm
View File

@@ -212,3 +212,19 @@
desc = "A hood that looks vaguely like a siffet's head. Guaranteed to traumatize your Promethean coworkers."
icon_state = "siffet"
item_state_slots = list(slot_r_hand_str = "siffet", slot_l_hand_str = "siffet")
//Hoodie Hood
/obj/item/clothing/head/hood/toggleable
name = "super special hood"
desc = "This hood is so special that you weren't even supposed to lay eyes on it! Tell a developer!"
var/open = FALSE
/obj/item/clothing/head/hood/toggleable/colorable
name = "hoodie hood"
desc = "It's the hood part of a hoodie. What kind of hoodie would it be without one? A poser, obviously."
icon_state = "choodie"
/obj/item/clothing/head/hood/toggleable/colorable/update_icon()
. = ..()
icon_state = "[initial(icon_state)][open ? "_open" : ""]"

3
code/modules/clothing/shoes/colour.dm
View File

@@ -57,6 +57,9 @@
name = "flats"
desc = "Sleek flats."
/obj/item/clothing/shoes/flats/white/color/alt
icon_state = "flatsalt"
/obj/item/clothing/shoes/flats/red
name = "red flats"
desc = "Ruby red flats."

5
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -179,6 +179,11 @@
drop_sound = 'sound/items/drop/clothing.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
/obj/item/clothing/shoes/ceremonial_guards
name = "ceremonial leg guards"
desc = "A pair of shin guards with gold inlay that cut off around the ankle."
icon_state = "ceremonial_guards"
/obj/item/clothing/shoes/ranger
var/bootcolor = "white"
name = "ranger boots"

33
code/modules/clothing/suits/hooded.dm
View File

@@ -32,8 +32,8 @@
..()
/obj/item/clothing/suit/storage/hooded/proc/RemoveHood()
icon_state = toggleicon
hood_up = FALSE
update_icon()
hood.canremove = TRUE // This shouldn't matter anyways but just incase.
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
@@ -55,14 +55,43 @@
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
return
else
if(color != hood.color)
hood.color = color
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = TRUE
hood.canremove = FALSE
icon_state = "[toggleicon]_t"
update_icon()
H.update_inv_wear_suit()
else
RemoveHood()
/obj/item/clothing/suit/storage/hooded/update_icon()
. = ..()
icon_state = "[toggleicon][hood_up ? "_t" : ""]"
//Hoodies you can unbutton and toggle the hood of independently
/obj/item/clothing/suit/storage/hooded/toggle/colorable
name = "hoodie"
desc = "A rather plain hoodie. If you can't find it in your closet, chances are your significant other is borrowing it."
icon_state = "choodie"
hoodtype = /obj/item/clothing/head/hood/toggleable/colorable
open = FALSE
/obj/item/clothing/suit/storage/hooded/toggle/colorable/random/Initialize() //For mapping
. = ..()
color = pick(COLOR_GRAY20, COLOR_GRAY, COLOR_MAROON, COLOR_DARK_ORANGE, COLOR_BRASS, COLOR_PURPLE, COLOR_SKY_BLUE, COLOR_LIGHT_VIOLET )
update_icon()
/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless
name = "sleeveless hoodie"
desc = "Either your arms were too hot or the sleeves vaporized when you gave someone a 'gunshow' with your muscles. Either way, the sleeves are missing."
icon_state = "choodie_sleeveless"
/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
name = "cropped hoodie"
desc = "It's not that this is a size too small, you just like showing off your midriff."
icon_state = "choodie_crop"
/obj/item/clothing/suit/storage/hooded/costume
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER

29
code/modules/clothing/suits/storage.dm
View File

@@ -66,21 +66,24 @@
set src in usr
if(!usr.canmove || usr.stat || usr.restrained())
return 0
if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user
open = 0
icon_state = initial(icon_state)
flags_inv = HIDETIE|HIDEHOLSTER
to_chat(usr, "You button up the coat.")
else if(open == 0)
open = 1
icon_state = "[icon_state]_open"
flags_inv = HIDEHOLSTER
to_chat(usr, "You unbutton the coat.")
else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed
if(open < 0)//in case some goofy admin switches icon states around without switching the icon_open or icon_closed
to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.")
return
update_clothing_icon() //so our overlays update
open = !open
flags_inv = open ? HIDETIE : HIDETIE|HIDEHOLSTER
update_icon()
to_chat(usr, "You [open ? "un" : ""]button \the [src].")
if(istype(hood,/obj/item/clothing/head/hood/toggleable)) //checks if a hood (which you should use) is attached
var/obj/item/clothing/head/hood/toggleable/T = hood
T.open = open //copy the jacket's open state to the hood
T.update_icon(usr) //usr as an arg to fix a weird runtime
T.update_clothing_icon()
update_clothing_icon() //so our overlays update
/obj/item/clothing/suit/storage/hooded/toggle/update_icon()
. = ..()
icon_state = "[toggleicon][open ? "_open" : ""][hood_up ? "_t" : ""]"
//New Vest 4 pocket storage and badge toggles, until suit accessories are a thing.

4
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -448,8 +448,8 @@
. = ..(ml, MAT_BRONZE)
/obj/item/clothing/accessory/halfcape
name = "half cape"
desc = "A tasteful half-cape, suitible for European nobles and retro anime protagonists."
name = "retro half cape"
desc = "A tasteful half-cape with epaulettes, suitible for European nobles and retro anime protagonists."
icon_state = "halfcape"
slot = ACCESSORY_SLOT_DECOR

134
code/modules/clothing/under/accessories/clothing.dm
View File

@@ -246,13 +246,124 @@
icon_state = "medcloak"
item_state = "medcloak"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/custom //A colorable cloak
name = "cloak"
desc = "A simple, bland cloak."
icon_state = "colorcloak"
item_state = "colorcloak"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/ceremonial
name = "ceremonial cloak"
desc = "A regal looking cloak of white with specks of gold woven into the fabric."
icon_state = "ceremonial_cloak"
item_state = "ceremonial_cloak"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/chapel
name = "\improper Pleromanist cloak"
desc = "An elaborate white and gold cloak typically worn by clergy during formal Pleromanist ceremonies."
icon_state = "chap_plem"
item_state = "chap_plem"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/chapel/alt
name = "\improper Unitarian cloak"
desc = "An elaborate black and gold cloak typically worn by clergy during formal Unitarian ceremonies."
icon_state = "chap_unit"
item_state = "chap_unit"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/half
name = "rough half cloak"
desc = "The latest fashion innovations by NanoThreads; the subtle stylings of slicing a regular cloak in half! All the ponce, half the manufacturing cost!"
icon_state = "roughcloak"
item_state = "roughcloak"
action_button_name = "Adjust Cloak"
var/open = 0 //0 is closed, 1 is open
/obj/item/clothing/accessory/storage/poncho/roles/cloak/half/update_clothing_icon()
. = ..()
if(ismob(src.loc))
var/mob/M = src.loc
M.update_inv_wear_suit()
/obj/item/clothing/accessory/storage/poncho/roles/cloak/half/attack_self(mob/user as mob)
if(src.open == 0)
src.icon_state = "[icon_state]_open"
src.item_state = "[item_state]_open"
flags_inv = HIDETIE|HIDEHOLSTER
open = 1
to_chat(user, "You flip the cloak over your shoulder.")
else if(src.open == 1)
src.icon_state = initial(icon_state)
src.item_state = initial(item_state)
flags_inv = HIDEHOLSTER
open = 0
to_chat(user, "You pull the cloak over your shoulder.")
else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed
to_chat(usr, "You attempt to flip the [src] over your shoulder, but can't quite make sense of it.")
return
update_clothing_icon()
/obj/item/clothing/accessory/storage/poncho/roles/cloak/shoulder
name = "left shoulder cloak"
desc = "A small cape that primarily covers the left shoulder. Might help you stand out more, not necessarily for the right reasons."
icon_state = "cape_left"
item_state = "cape_left"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/shoulder/right
name = "right shoulder cloak"
desc = "A small cape that primarily covers the right shoulder. Maybe fashion like this is best left to the professionals."
icon_state = "cape_right"
item_state = "cape_right"
//Capelets
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet
name = "shoulder capelet"
desc = "Not a cloak and not really a cape either, but a silky fabric that rests on the neck and shoulders alone."
icon_state = "capelet"
item_state = "capelet"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet/cargo
name = "cargo capelet"
desc = "A shoulder capelet bearing the colors of the Supply department, with a gold lapel emblazoned upon the front."
icon_state = "qmcapelet"
item_state = "qmcapelet"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet/security
name = "security capelet"
desc = "A shoulder capelet bearing the colors of the Security department, featuring rugged molding around the collar."
icon_state = "hoscapelet"
item_state = "hoscapelet"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet/engineering
name = "engineering capelet"
desc = "A shoulder capelet bearing the colors of the Engineering department, accenting the pristine white fabric."
icon_state = "cecapelet"
item_state = "cecapelet"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet/research
name = "research capelet"
desc = "A shoulder capelet bearing the colors of the Research department, the material slick and hydrophobic."
icon_state = "rdcapelet"
item_state = "rdcapelet"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet/medical
name = "medical capelet"
desc = "A shoulder capelet bearing the general colors of the Medical department, dyed a sterile nitrile cyan."
icon_state = "cmocapelet"
item_state = "cmocapelet"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet/hop
name = "management capelet"
desc = "A shoulder capelet bearing the colors of the Head of Personnel's uniform, featuring the typical royal blue contrasted by authoritative red."
icon_state = "hocapelet"
item_state = "hopcapelet"
/obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet/cap
name = "director capelet"
desc = "A shoulder capelet bearing NanoTrasen formal uniform colours, a commanding blue with regal gold inlay."
icon_state = "capcapelet"
item_state = "capcapelet"
/obj/item/clothing/accessory/hawaii
name = "flower-pattern shirt"
desc = "You probably need some welder googles to look at this."
@@ -430,3 +541,24 @@
name = "orange asymmetrical overcoat"
desc = "An asymmetrical orange overcoat in a 2560's fashion."
icon_state = "asymovercoat"
//The gold trim from one of the qipaos, separated to an accessory to preserve the color
/obj/item/clothing/accessory/qipaogold
name = "gold trim"
desc = "Gold trim belonging to a qipao. Why would you remove this?"
icon_state = "qipaogold"
//Ceremonial armour set
/obj/item/clothing/accessory/ceremonial_bracers
name = "ceremonial bracers"
desc = "A pair of metal bracers with gold inlay. They're thin and light."
icon_state = "ceremonialbracers"
body_parts_covered = ARMS
slot = ACCESSORY_SLOT_DECOR
/obj/item/clothing/accessory/ceremonial_loins
name = "ceremonial loincloth"
desc = "A lengthy loincloth that drapes over the loins, obviously. It's quite long."
icon_state = "ceremonialloincloth"
body_parts_covered = LOWER_TORSO
slot = ACCESSORY_SLOT_DECOR

40
code/modules/clothing/under/miscellaneous.dm
View File

@@ -509,6 +509,27 @@
icon_state = "goldwrap"
index = 1
/obj/item/clothing/under/dress/little_strapless
name = "short strapless dress"
desc = "The classic little black dress now comes in colours other than black."
icon_state = "littlestrapless"
index = 1
/obj/item/clothing/under/dress/long_strapless
name = "long strapless dress"
desc = "A sleek sleeveless dress for the modern sophisticate."
icon_state = "longstrapless"
index = 1
/obj/item/clothing/under/dress/ceremonial
name = "ceremonial corset"
desc = "A regal black and gold tight corset with silky sleeves. A sheer bodystocking accompanies it."
icon_state = "ceremonial"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/dress/ceremonial/sheerless
desc = "A regal black and gold tight corset with silky sleeves."
worn_state = "ceremonial_c"
/*
* wedding stuff
@@ -752,17 +773,34 @@ Uniforms and such
icon_state = "cheongsam-darkblue"
/obj/item/clothing/under/qipao
name = "qipao"
name = "short qipao"
desc = "A traditional Chinese women's garment, typically made from silk."
icon_state = "qipao"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/qipao/black
name = "black qipao"
icon_state = "qipao_black"
/obj/item/clothing/under/qipao/red
name = "red qipao"
icon_state = "qipao_red"
/obj/item/clothing/under/qipao/white
name = "white qipao"
icon_state = "qipao_white"
/obj/item/clothing/under/qipao2
name = "slim qipao"
desc = "A traditional Chinese women's garment, typically made from silk. This one is fairly slim."
icon_state = "qipao2"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/qipao/colorable
name = "qipao"
icon_state = "qipao_white"
starting_accessories = list(/obj/item/clothing/accessory/qipaogold)
/obj/item/clothing/under/blazer
name = "blue blazer"
desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."

57
code/modules/clothing/under/shorts.dm
View File

@@ -126,7 +126,7 @@
/obj/item/clothing/under/skirt/swept
name = "swept skirt"
desc = "A skirt that is swept to one side."
icon_state = "skirt_swept"
icon_state = "skirt_swept_black"
/obj/item/clothing/under/skirt/loincloth
name = "loincloth"
@@ -139,6 +139,61 @@
icon_state = "pleated"
addblends = "pleated_a"
//Colorable skirts
/obj/item/clothing/under/skirt/colorable
name = "skirt"
desc = "A rather plain looking skirt."
icon_state = "skirt_casual"
/obj/item/clothing/under/skirt/colorable/puffy
icon_state = "skirt_puffy"
/obj/item/clothing/under/skirt/colorable/skater
desc = "A skirt with loose frills."
icon_state = "skirt_skater"
/obj/item/clothing/under/skirt/colorable/pleated
desc = "A short skirt featuring pleat trailing up from the hem."
icon_state = "skirt_pleated"
/obj/item/clothing/under/skirt/colorable/pencil
name = "pencil skirt"
desc = "A short skirt that's almost as thin as a pencil. Almost."
icon_state = "skirt_pencil"
/obj/item/clothing/under/skirt/colorable/plaid
name = "plaid skirt"
desc = "A skirt featuring a plaid pattern."
icon_state = "skirt_plaid"
/obj/item/clothing/under/skirt/colorable/tube
desc = "A long thin skirt that trails beyond the knees."
icon_state = "skirt_tube"
/obj/item/clothing/under/skirt/colorable/long
name = "long skirt"
icon_state = "skirt_long"
/obj/item/clothing/under/skirt/colorable/high
name = "high skirt"
desc = "A skirt that rests at the waist instead of the hips."
icon_state = "skirt_high"
/obj/item/clothing/under/skirt/colorable/swept
name = "swept skirt"
desc = "A skirt with an angled hem; shorter on one side, longer on the other, like a sweep."
icon_state = "skirt_swept"
/obj/item/clothing/under/skirt/colorable/jumper
name = "jumper skirt"
desc = "A skirt that's held up by suspenders."
icon_state = "skirt_jumper"
/obj/item/clothing/under/skirt/colorable/jumperdress
name = "jumper dress"
desc = "A dress held up by suspenders. Not quite a skirt anymore."
icon_state = "skirt_jumperdress"
/obj/item/clothing/under/skirt/outfit
name = "black skirt"
desc = "A black skirt, very fancy!"

BIN
icons/mob/feet.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 52 KiB

BIN
icons/mob/hands.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
icons/mob/head.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 KiB

After

Width:  |  Height:  |  Size: 270 KiB

BIN
icons/mob/suit.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 KiB

After

Width:  |  Height:  |  Size: 368 KiB

BIN
icons/mob/suit_1.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
icons/mob/ties.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 108 KiB

BIN
icons/mob/uniform.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 370 KiB

After

Width:  |  Height:  |  Size: 356 KiB

BIN
icons/mob/uniform_1.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 106 KiB

BIN
icons/obj/clothing/hats.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 131 KiB

BIN
icons/obj/clothing/shoes.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 32 KiB

BIN
icons/obj/clothing/suits.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 119 KiB

BIN
icons/obj/clothing/ties.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 76 KiB

BIN
icons/obj/clothing/uniforms.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 107 KiB

BIN
icons/obj/clothing/uniforms_1.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 37 KiB