mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-31 09:00:25 +01:00
Pants Slot, Again (#20240)
From previous PR: - Fixes Quick Equip (Thanks, Matt) - Fixes Loadout Preview, will override uniforms properly now - Turns shirts into uniform items, so you can attach accessories to them This also fixes the issue of people spawning in shirtless if they didn't attach properly to the pants. Additions: - Shifts suspenders, leather chaps, and kneepads to be pants accessories. (This fixes the issue of accessories staying even without pants, e.g. assless chaps) (In future, hip holsters are to be added to this accessory list) Anyway, that's the long and short of it. Have fun. --------- Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
co-authored by
Fluffy
Fluffy
parent
457a091d9a
commit
10d7063030
@@ -20,7 +20,7 @@ ABSTRACT_TYPE(/datum/gear/accessory)
|
||||
..()
|
||||
var/list/waistcoats = list()
|
||||
waistcoats["waistcoat"] = /obj/item/clothing/accessory/wcoat_rec
|
||||
waistcoats["waistcoat, alt"] = /obj/item/clothing/accessory/silversun/wcoat
|
||||
waistcoats["waistcoat, alt"] = /obj/item/clothing/accessory/wcoat_rec/det_vest
|
||||
gear_tweaks += new /datum/gear_tweak/path(waistcoats)
|
||||
|
||||
/datum/gear/accessory/chaps
|
||||
@@ -188,45 +188,7 @@ ABSTRACT_TYPE(/datum/gear/accessory)
|
||||
allowed_roles = list("Shaft Miner", "Xenoarchaeologist", "Operations Personnel", "Science Personnel")
|
||||
cost = 2
|
||||
|
||||
/datum/gear/accessory/polo
|
||||
display_name = "polo shirts selection"
|
||||
description = "A selection of polo shirts."
|
||||
path = /obj/item/clothing/accessory/polo
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
|
||||
|
||||
/datum/gear/accessory/polo/New()
|
||||
..()
|
||||
var/list/polo = list()
|
||||
|
||||
polo["blue polo shirt"] = /obj/item/clothing/accessory/polo/polo_blue
|
||||
polo["blue polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_blue_fem
|
||||
polo["red polo shirt"] = /obj/item/clothing/accessory/polo/polo_red
|
||||
polo["red polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_red_fem
|
||||
polo["tan polo shirt"] = /obj/item/clothing/accessory/polo/polo_grayyellow
|
||||
polo["tan polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_grayyellow_fem
|
||||
polo["polo shirt, green strip"] = /obj/item/clothing/accessory/polo/polo_greenstrip
|
||||
polo["polo shirt, green strip (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_greenstrip_fem
|
||||
polo["polo shirt, blue strip"] = /obj/item/clothing/accessory/polo/polo_bluestrip
|
||||
polo["polo shirt, blue strip (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_bluestrip_fem
|
||||
polo["polo shirt, red strip"] = /obj/item/clothing/accessory/polo/polo_redstrip
|
||||
polo["polo shirt, red strip (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_redstrip_fem
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(polo)
|
||||
|
||||
/datum/gear/accessory/polo_colorable
|
||||
display_name = "polo shirts selection (colorable)"
|
||||
description = "A selection of colorable polo shirts."
|
||||
path = /obj/item/clothing/accessory/polo
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/accessory/polo_colorable/New()
|
||||
..()
|
||||
var/list/polo_colorable = list()
|
||||
|
||||
polo_colorable["polo shirt"] = /obj/item/clothing/accessory/polo
|
||||
polo_colorable["polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_fem
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(polo_colorable)
|
||||
|
||||
/datum/gear/accessory/sweater
|
||||
display_name = "sweater selection"
|
||||
@@ -259,53 +221,6 @@ ABSTRACT_TYPE(/datum/gear/accessory)
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(sweater)
|
||||
|
||||
/datum/gear/accessory/shirt
|
||||
display_name = "shirt selection"
|
||||
path = /obj/item/clothing/accessory/dressshirt
|
||||
description = "A selection of shirts."
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/accessory/shirt/New()
|
||||
..()
|
||||
var/list/shirt = list()
|
||||
shirt["dress shirt"] = /obj/item/clothing/accessory/dressshirt
|
||||
shirt["dress shirt, rolled up"] = /obj/item/clothing/accessory/dressshirt/rolled
|
||||
shirt["dress shirt, cropped"] = /obj/item/clothing/accessory/dressshirt/crop
|
||||
shirt["cropped dress shirt, rolled up"] = /obj/item/clothing/accessory/dressshirt/crop/rolled
|
||||
shirt["dress shirt, alt"] = /obj/item/clothing/accessory/dressshirt/alt
|
||||
shirt["dress shirt, alt rolled up"] = /obj/item/clothing/accessory/dressshirt/alt/rolled
|
||||
shirt["dress shirt, v-neck alt"] = /obj/item/clothing/accessory/dressshirt/alt/vneck
|
||||
shirt["dress shirt, v-neck alt rolled up"] = /obj/item/clothing/accessory/dressshirt/alt/vneck/rolled
|
||||
shirt["dress shirt, deep v-neck"] = /obj/item/clothing/accessory/dressshirt/deepv
|
||||
shirt["dress shirt, deep v-neck rolled up"] = /obj/item/clothing/accessory/dressshirt/deepv/rolled
|
||||
shirt["dress shirt, asymmetric"] = /obj/item/clothing/accessory/dressshirt/asymmetric
|
||||
shirt["long-sleeved shirt"] = /obj/item/clothing/accessory/longsleeve
|
||||
shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/accessory/longsleeve_s
|
||||
shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/accessory/longsleeve_sb
|
||||
shirt["t-shirt"] = /obj/item/clothing/accessory/tshirt
|
||||
shirt["t-shirt, cropped"] = /obj/item/clothing/accessory/tshirt_crop
|
||||
shirt["blouse"] = /obj/item/clothing/accessory/blouse
|
||||
shirt["long-sleeved blouse"] = /obj/item/clothing/accessory/longblouse
|
||||
shirt["puffy blouse"] = /obj/item/clothing/accessory/puffyblouse
|
||||
shirt["halter top"] = /obj/item/clothing/accessory/haltertop
|
||||
shirt["tank top"] = /obj/item/clothing/accessory/tanktop
|
||||
shirt["tank top, feminine"] = /obj/item/clothing/accessory/tanktop/feminine
|
||||
gear_tweaks += new /datum/gear_tweak/path(shirt)
|
||||
|
||||
/datum/gear/accessory/silversun
|
||||
display_name = "silversun floral shirt selection"
|
||||
path = /obj/item/clothing/accessory/silversun
|
||||
description = "A selection of Silversun floral shirts."
|
||||
flags = GEAR_HAS_DESC_SELECTION
|
||||
|
||||
/datum/gear/accessory/silversun/New()
|
||||
..()
|
||||
var/list/shirts = list()
|
||||
shirts["cyan silversun shirt"] = /obj/item/clothing/accessory/silversun
|
||||
shirts["red silversun shirt"] = /obj/item/clothing/accessory/silversun/red
|
||||
shirts["random colored silversun shirt"] = /obj/item/clothing/accessory/silversun/random
|
||||
gear_tweaks += new /datum/gear_tweak/path(shirts)
|
||||
|
||||
/datum/gear/accessory/university
|
||||
display_name = "university sweatshirt selection"
|
||||
path = /obj/item/clothing/accessory/university
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
ABSTRACT_TYPE(/datum/gear/pants)
|
||||
sort_category = "Skirts and Trousers" //wikipedia definition puts shorts under trousers category, so.
|
||||
slot = slot_pants
|
||||
|
||||
/datum/gear/pants/trousers
|
||||
display_name = "pants and shorts selection"
|
||||
description = "A selection of pants and shorts."
|
||||
path = /obj/item/clothing/pants
|
||||
|
||||
/datum/gear/pants/trousers/New()
|
||||
..()
|
||||
var/list/pants = list()
|
||||
|
||||
// Pants
|
||||
pants["jeans"] = /obj/item/clothing/pants/jeans
|
||||
pants["classic jeans"] = /obj/item/clothing/pants/classic
|
||||
pants["mustang jeans"] = /obj/item/clothing/pants/mustang
|
||||
pants["black jeans"] = /obj/item/clothing/pants/jeansblack
|
||||
pants["white pants"] = /obj/item/clothing/pants/white
|
||||
pants["black pants"] = /obj/item/clothing/pants/black
|
||||
pants["red pants"] = /obj/item/clothing/pants/red
|
||||
pants["tan pants"] = /obj/item/clothing/pants/tan
|
||||
pants["khaki pants"] = /obj/item/clothing/pants/khaki
|
||||
pants["high visibility pants"] = /obj/item/clothing/pants/highvis
|
||||
pants["high visibility pants, alt"] = /obj/item/clothing/pants/highvis_alt
|
||||
pants["track pants"] = /obj/item/clothing/pants/track
|
||||
pants["blue track pants"] = /obj/item/clothing/pants/track/blue
|
||||
pants["green track pants"] = /obj/item/clothing/pants/track/green
|
||||
pants["white track pants"] = /obj/item/clothing/pants/track/white
|
||||
pants["red track pants"] = /obj/item/clothing/pants/track/red
|
||||
pants["camo pants"] = /obj/item/clothing/pants/camo
|
||||
pants["tacticool pants"] = /obj/item/clothing/pants/tacticool
|
||||
pants["designer jeans"] = /obj/item/clothing/pants/designer
|
||||
pants["ripped jeans"] = /obj/item/clothing/pants/ripped
|
||||
pants["black ripped jeans"] = /obj/item/clothing/pants/blackripped
|
||||
|
||||
// Shorts
|
||||
pants["black shorts"] = /obj/item/clothing/pants/shorts/black
|
||||
pants["black short shorts"] = /obj/item/clothing/pants/shorts/black/short
|
||||
pants["khaki shorts"] = /obj/item/clothing/pants/shorts/khaki
|
||||
pants["khaki short shorts"] = /obj/item/clothing/pants/shorts/khaki/short
|
||||
|
||||
// Jeans Shorts
|
||||
pants["jeans shorts"] = /obj/item/clothing/pants/shorts/jeans
|
||||
pants["jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/short
|
||||
pants["classic jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/classic
|
||||
pants["classic jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/classic/short
|
||||
pants["mustang jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/mustang
|
||||
pants["mustang jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/mustang/short
|
||||
pants["black jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/black
|
||||
pants["black jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/black/short
|
||||
pants["grey jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/grey
|
||||
pants["grey jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/grey/short
|
||||
|
||||
// Athletic Shorts
|
||||
pants["black athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/black
|
||||
pants["red athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/red
|
||||
pants["green athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/green
|
||||
pants["grey athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/grey
|
||||
pants["SCC-branded athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/scc
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(pants)
|
||||
|
||||
/datum/gear/pants/colorpants
|
||||
display_name = "pants and shorts selection (colourable)"
|
||||
description = "A selection of colourable pants and shorts."
|
||||
path = /obj/item/clothing/pants/dress
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/pants/colorpants/New()
|
||||
..()
|
||||
var/list/colorpants = list()
|
||||
|
||||
// Pants
|
||||
colorpants["dress pants"] = /obj/item/clothing/pants/dress
|
||||
colorpants["dress pants, with belt"] = /obj/item/clothing/pants/dress/belt
|
||||
colorpants["striped pants"] = /obj/item/clothing/pants/striped
|
||||
colorpants["flared pants"] = /obj/item/clothing/pants/flared
|
||||
colorpants["mustang jeans"] = /obj/item/clothing/pants/mustang/colourable
|
||||
colorpants["tailored jeans"] = /obj/item/clothing/pants/tailoredjeans
|
||||
|
||||
// Shorts
|
||||
colorpants["shorts"] = /obj/item/clothing/pants/shorts/colourable
|
||||
colorpants["short shorts"] = /obj/item/clothing/pants/shorts/colourable/short
|
||||
colorpants["athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/colourable
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(colorpants)
|
||||
|
||||
/datum/gear/pants/skirt
|
||||
display_name = "skirt selection"
|
||||
description = "A selection of skirts."
|
||||
path = /obj/item/clothing/pants/skirt
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/pants/skirt/New()
|
||||
..()
|
||||
var/list/skirts = list()
|
||||
skirts["casual skirt"] = /obj/item/clothing/pants/skirt
|
||||
skirts["puffy skirt"] = /obj/item/clothing/pants/skirt/puffy
|
||||
skirts["long skirt"] = /obj/item/clothing/pants/skirt/long
|
||||
skirts["pencil skirt"] = /obj/item/clothing/pants/skirt/pencil
|
||||
skirts["swept skirt"] = /obj/item/clothing/pants/skirt/swept
|
||||
skirts["plaid skirt"] = /obj/item/clothing/pants/skirt/plaid
|
||||
skirts["pleated skirt"] = /obj/item/clothing/pants/skirt/pleated
|
||||
skirts["high skirt"] = /obj/item/clothing/pants/skirt/high
|
||||
skirts["skater skirt"] = /obj/item/clothing/pants/skirt/skater
|
||||
skirts["tube skirt"] = /obj/item/clothing/pants/skirt/tube
|
||||
skirts["jumper skirt"] = /obj/item/clothing/pants/skirt/jumper
|
||||
skirts["jumper dress"] = /obj/item/clothing/pants/skirt/jumper_highcut
|
||||
skirts["long straight skirt"] = /obj/item/clothing/pants/skirt/straightlong
|
||||
gear_tweaks += new /datum/gear_tweak/path(skirts)
|
||||
@@ -0,0 +1,90 @@
|
||||
ABSTRACT_TYPE(/datum/gear/shirts)
|
||||
sort_category = "Shirts and Tops"
|
||||
slot = slot_w_uniform
|
||||
|
||||
/datum/gear/shirts/polo
|
||||
display_name = "polo shirts selection"
|
||||
description = "A selection of polo shirts."
|
||||
path = /obj/item/clothing/under/dressshirt/polo
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
|
||||
|
||||
/datum/gear/shirts/polo/New()
|
||||
..()
|
||||
var/list/polo = list()
|
||||
|
||||
polo["blue polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_blue
|
||||
polo["blue polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_blue_fem
|
||||
polo["red polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_red
|
||||
polo["red polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_red_fem
|
||||
polo["tan polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_grayyellow
|
||||
polo["tan polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_grayyellow_fem
|
||||
polo["polo shirt, green strip"] = /obj/item/clothing/under/dressshirt/polo/polo_greenstrip
|
||||
polo["polo shirt, green strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_greenstrip_fem
|
||||
polo["polo shirt, blue strip"] = /obj/item/clothing/under/dressshirt/polo/polo_bluestrip
|
||||
polo["polo shirt, blue strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_bluestrip_fem
|
||||
polo["polo shirt, red strip"] = /obj/item/clothing/under/dressshirt/polo/polo_redstrip
|
||||
polo["polo shirt, red strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_redstrip_fem
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(polo)
|
||||
|
||||
/datum/gear/shirts/polo_colorable
|
||||
display_name = "polo shirts selection (colorable)"
|
||||
description = "A selection of colorable polo shirts."
|
||||
path = /obj/item/clothing/under/dressshirt/polo
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/shirts/polo_colorable/New()
|
||||
..()
|
||||
var/list/polo_colorable = list()
|
||||
|
||||
polo_colorable["polo shirt"] = /obj/item/clothing/under/dressshirt/polo
|
||||
polo_colorable["polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_fem
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(polo_colorable)
|
||||
|
||||
/datum/gear/shirts/shirt
|
||||
display_name = "shirt selection"
|
||||
path = /obj/item/clothing/under/dressshirt
|
||||
description = "A selection of shirts."
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/shirts/shirt/New()
|
||||
..()
|
||||
var/list/shirt = list()
|
||||
shirt["dress shirt"] = /obj/item/clothing/under/dressshirt
|
||||
shirt["dress shirt, rolled up"] = /obj/item/clothing/under/dressshirt/rolled
|
||||
shirt["dress shirt, cropped"] = /obj/item/clothing/under/dressshirt/crop
|
||||
shirt["cropped dress shirt, rolled up"] = /obj/item/clothing/under/dressshirt/crop/rolled
|
||||
shirt["dress shirt, alt"] = /obj/item/clothing/under/dressshirt/alt
|
||||
shirt["dress shirt, alt rolled up"] = /obj/item/clothing/under/dressshirt/alt/rolled
|
||||
shirt["dress shirt, v-neck alt"] = /obj/item/clothing/under/dressshirt/alt/vneck
|
||||
shirt["dress shirt, v-neck alt rolled up"] = /obj/item/clothing/under/dressshirt/alt/vneck/rolled
|
||||
shirt["dress shirt, deep v-neck"] = /obj/item/clothing/under/dressshirt/deepv
|
||||
shirt["dress shirt, deep v-neck rolled up"] = /obj/item/clothing/under/dressshirt/deepv/rolled
|
||||
shirt["dress shirt, asymmetric"] = /obj/item/clothing/under/dressshirt/asymmetric
|
||||
shirt["long-sleeved shirt"] = /obj/item/clothing/under/dressshirt/longsleeve
|
||||
shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/under/dressshirt/longsleeve_s
|
||||
shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/under/dressshirt/longsleeve_sb
|
||||
shirt["t-shirt"] = /obj/item/clothing/under/dressshirt/tshirt
|
||||
shirt["t-shirt, cropped"] = /obj/item/clothing/under/dressshirt/tshirt_crop
|
||||
shirt["blouse"] = /obj/item/clothing/under/dressshirt/blouse
|
||||
shirt["long-sleeved blouse"] = /obj/item/clothing/under/dressshirt/longblouse
|
||||
shirt["puffy blouse"] = /obj/item/clothing/under/dressshirt/puffyblouse
|
||||
shirt["halter top"] = /obj/item/clothing/under/dressshirt/haltertop
|
||||
shirt["tank top"] = /obj/item/clothing/under/dressshirt/tanktop
|
||||
shirt["tank top, feminine"] = /obj/item/clothing/under/dressshirt/tanktop/feminine
|
||||
gear_tweaks += new /datum/gear_tweak/path(shirt)
|
||||
|
||||
/datum/gear/shirts/silversun
|
||||
display_name = "silversun floral shirt selection"
|
||||
path = /obj/item/clothing/under/dressshirt/silversun
|
||||
description = "A selection of Silversun floral shirts."
|
||||
flags = GEAR_HAS_DESC_SELECTION
|
||||
|
||||
/datum/gear/shirts/silversun/New()
|
||||
..()
|
||||
var/list/shirts = list()
|
||||
shirts["cyan silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun
|
||||
shirts["red silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/red
|
||||
shirts["random colored silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/random
|
||||
gear_tweaks += new /datum/gear_tweak/path(shirts)
|
||||
@@ -49,30 +49,6 @@
|
||||
path = /obj/item/clothing/under/color/colorable
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/uniform/skirt
|
||||
display_name = "skirt selection"
|
||||
description = "A selection of skirts."
|
||||
path = /obj/item/clothing/under/skirt
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/uniform/skirt/New()
|
||||
..()
|
||||
var/list/skirts = list()
|
||||
skirts["casual skirt"] = /obj/item/clothing/under/skirt
|
||||
skirts["puffy skirt"] = /obj/item/clothing/under/skirt/puffy
|
||||
skirts["long skirt"] = /obj/item/clothing/under/skirt/long
|
||||
skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil
|
||||
skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept
|
||||
skirts["plaid skirt"] = /obj/item/clothing/under/skirt/plaid
|
||||
skirts["pleated skirt"] = /obj/item/clothing/under/skirt/pleated
|
||||
skirts["high skirt"] = /obj/item/clothing/under/skirt/high
|
||||
skirts["skater skirt"] = /obj/item/clothing/under/skirt/skater
|
||||
skirts["tube skirt"] = /obj/item/clothing/under/skirt/tube
|
||||
skirts["jumper skirt"] = /obj/item/clothing/under/skirt/jumper
|
||||
skirts["jumper dress"] = /obj/item/clothing/under/skirt/jumper_highcut
|
||||
skirts["long straight skirt"] = /obj/item/clothing/under/skirt/straightlong
|
||||
gear_tweaks += new /datum/gear_tweak/path(skirts)
|
||||
|
||||
/datum/gear/uniform/suit
|
||||
display_name = "suit selection"
|
||||
description = "A selection of formal suits."
|
||||
@@ -165,90 +141,6 @@
|
||||
bridgecrew["bridge crew uniform, san colettish, blue"] = /obj/item/clothing/under/rank/bridge_crew/sancolette/alt
|
||||
gear_tweaks += new /datum/gear_tweak/path(bridgecrew)
|
||||
|
||||
/datum/gear/uniform/pants
|
||||
display_name = "pants and shorts selection"
|
||||
description = "A selection of pants and shorts."
|
||||
path = /obj/item/clothing/under/pants
|
||||
|
||||
/datum/gear/uniform/pants/New()
|
||||
..()
|
||||
var/list/pants = list()
|
||||
|
||||
// Pants
|
||||
pants["jeans"] = /obj/item/clothing/under/pants/jeans
|
||||
pants["classic jeans"] = /obj/item/clothing/under/pants/classic
|
||||
pants["mustang jeans"] = /obj/item/clothing/under/pants/mustang
|
||||
pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack
|
||||
pants["white pants"] = /obj/item/clothing/under/pants/white
|
||||
pants["black pants"] = /obj/item/clothing/under/pants/black
|
||||
pants["red pants"] = /obj/item/clothing/under/pants/red
|
||||
pants["tan pants"] = /obj/item/clothing/under/pants/tan
|
||||
pants["khaki pants"] = /obj/item/clothing/under/pants/khaki
|
||||
pants["high visibility pants"] = /obj/item/clothing/under/pants/highvis
|
||||
pants["high visibility pants, alt"] = /obj/item/clothing/under/pants/highvis_alt
|
||||
pants["track pants"] = /obj/item/clothing/under/pants/track
|
||||
pants["blue track pants"] = /obj/item/clothing/under/pants/track/blue
|
||||
pants["green track pants"] = /obj/item/clothing/under/pants/track/green
|
||||
pants["white track pants"] = /obj/item/clothing/under/pants/track/white
|
||||
pants["red track pants"] = /obj/item/clothing/under/pants/track/red
|
||||
pants["camo pants"] = /obj/item/clothing/under/pants/camo
|
||||
pants["tacticool pants"] = /obj/item/clothing/under/pants/tacticool
|
||||
pants["designer jeans"] = /obj/item/clothing/under/pants/designer
|
||||
pants["ripped jeans"] = /obj/item/clothing/under/pants/ripped
|
||||
pants["black ripped jeans"] = /obj/item/clothing/under/pants/blackripped
|
||||
|
||||
// Shorts
|
||||
pants["black shorts"] = /obj/item/clothing/under/shorts/black
|
||||
pants["black short shorts"] = /obj/item/clothing/under/shorts/black/short
|
||||
pants["khaki shorts"] = /obj/item/clothing/under/shorts/khaki
|
||||
pants["khaki short shorts"] = /obj/item/clothing/under/shorts/khaki/short
|
||||
|
||||
// Jeans Shorts
|
||||
pants["jeans shorts"] = /obj/item/clothing/under/shorts/jeans
|
||||
pants["jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/short
|
||||
pants["classic jeans shorts"] = /obj/item/clothing/under/shorts/jeans/classic
|
||||
pants["classic jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/classic/short
|
||||
pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang
|
||||
pants["mustang jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/short
|
||||
pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black
|
||||
pants["black jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/black/short
|
||||
pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey
|
||||
pants["grey jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/grey/short
|
||||
|
||||
// Athletic Shorts
|
||||
pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black
|
||||
pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red
|
||||
pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green
|
||||
pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey
|
||||
pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(pants)
|
||||
|
||||
/datum/gear/uniform/colorpants
|
||||
display_name = "pants and shorts selection (colourable)"
|
||||
description = "A selection of colourable pants and shorts."
|
||||
path = /obj/item/clothing/under/pants/dress
|
||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||
|
||||
/datum/gear/uniform/colorpants/New()
|
||||
..()
|
||||
var/list/colorpants = list()
|
||||
|
||||
// Pants
|
||||
colorpants["dress pants"] = /obj/item/clothing/under/pants/dress
|
||||
colorpants["dress pants, with belt"] = /obj/item/clothing/under/pants/dress/belt
|
||||
colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
|
||||
colorpants["flared pants"] = /obj/item/clothing/under/pants/flared
|
||||
colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable
|
||||
colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
|
||||
|
||||
// Shorts
|
||||
colorpants["shorts"] = /obj/item/clothing/under/shorts/colourable
|
||||
colorpants["short shorts"] = /obj/item/clothing/under/shorts/colourable/short
|
||||
colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable
|
||||
|
||||
gear_tweaks += new /datum/gear_tweak/path(colorpants)
|
||||
|
||||
/datum/gear/uniform/turtleneck
|
||||
display_name = "tacticool turtleneck"
|
||||
path = /obj/item/clothing/under/syndicate/tacticool
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
GLOBAL_DATUM_INIT(gear_tweak_wrist_layer, /datum/gear_tweak/wrist_layer, new())
|
||||
|
||||
/datum/gear_tweak/wrist_layer
|
||||
var/list/options = list(WRISTS_UNDER = WRISTS_LAYER_UNDER, WRISTS_OVER_UNIFORM = WRISTS_LAYER_UNIFORM, WRISTS_OVER_SUIT = WRISTS_LAYER_OVER)
|
||||
var/list/options = list(WRISTS_UNDER = UNDER_UNIFORM_LAYER_WR, WRISTS_OVER_UNIFORM = ABOVE_UNIFORM_LAYER_WR, WRISTS_OVER_SUIT = ABOVE_SUIT_LAYER_WR)
|
||||
|
||||
/datum/gear_tweak/wrist_layer/get_contents(var/metadata)
|
||||
return "Wrist Layer: [metadata]"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
/datum/gear/uniform/offworlder/skirt
|
||||
display_name = "CR skirt"
|
||||
path = /obj/item/clothing/under/skirt/offworlder
|
||||
path = /obj/item/clothing/pants/skirt/offworlder
|
||||
|
||||
/datum/gear/eyes/starshades
|
||||
display_name = "starshades"
|
||||
|
||||
@@ -204,9 +204,9 @@ ABSTRACT_TYPE(/datum/gear/augment/machine)
|
||||
/datum/gear/accessory/goldendeep/New()
|
||||
..()
|
||||
var/list/goldendeepshirt = list()
|
||||
goldendeepshirt["golden deep fine shirt"] = /obj/item/clothing/accessory/goldendeep
|
||||
goldendeepshirt["golden deep pompous shirt"] = /obj/item/clothing/accessory/goldendeep/pompous
|
||||
goldendeepshirt["golden deep cloth wrapped uniform"] = /obj/item/clothing/accessory/goldendeep/clothwrappeduniform
|
||||
goldendeepshirt["golden deep fine shirt"] = /obj/item/clothing/under/dressshirt/goldendeep
|
||||
goldendeepshirt["golden deep pompous shirt"] = /obj/item/clothing/under/dressshirt/goldendeep/pompous
|
||||
goldendeepshirt["golden deep cloth wrapped uniform"] = /obj/item/clothing/under/dressshirt/goldendeep/clothwrappeduniform
|
||||
gear_tweaks += new /datum/gear_tweak/path(goldendeepshirt)
|
||||
|
||||
/datum/gear/accessory/goldendeepouter
|
||||
|
||||
@@ -374,7 +374,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell)
|
||||
|
||||
/datum/gear/accessory/skrell/tees
|
||||
display_name = "skrellian wetshirts"
|
||||
path = /obj/item/clothing/accessory/tshirt/skrell
|
||||
path = /obj/item/clothing/under/tshirt/skrell
|
||||
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
|
||||
sort_category = "Xenowear - Skrell"
|
||||
flags = GEAR_HAS_DESC_SELECTION
|
||||
@@ -382,20 +382,20 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell)
|
||||
/datum/gear/accessory/skrell/tees/New()
|
||||
..()
|
||||
var/list/tees = list()
|
||||
tees["ocean wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/ocean
|
||||
tees["maelstrom wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/maelstrom
|
||||
tees["reef wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/reef
|
||||
tees["pink eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula
|
||||
tees["purple eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/purple
|
||||
tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/teal
|
||||
tees["black eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/black
|
||||
tees["white eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/white
|
||||
tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk
|
||||
tees["ocean wetshirt"] = /obj/item/clothing/under/tshirt/skrell/ocean
|
||||
tees["maelstrom wetshirt"] = /obj/item/clothing/under/tshirt/skrell/maelstrom
|
||||
tees["reef wetshirt"] = /obj/item/clothing/under/tshirt/skrell/reef
|
||||
tees["pink eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula
|
||||
tees["purple eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/purple
|
||||
tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/teal
|
||||
tees["black eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/black
|
||||
tees["white eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/white
|
||||
tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/nralakk
|
||||
gear_tweaks += new /datum/gear_tweak/path(tees)
|
||||
|
||||
/datum/gear/accessory/skrell/dress
|
||||
display_name = "skrellian formal wetshirts"
|
||||
path = /obj/item/clothing/accessory/dressshirt/skrell
|
||||
path = /obj/item/clothing/under/dressshirt/skrell
|
||||
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
|
||||
sort_category = "Xenowear - Skrell"
|
||||
flags = GEAR_HAS_DESC_SELECTION
|
||||
@@ -403,9 +403,9 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell)
|
||||
/datum/gear/accessory/skrell/dress/New()
|
||||
..()
|
||||
var/list/dress = list()
|
||||
dress["ocean formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/ocean
|
||||
dress["maelstrom formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/maelstrom
|
||||
dress["reef formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/reef
|
||||
dress["ocean formal wetshirt"] = /obj/item/clothing/under/dressshirt/skrell/ocean
|
||||
dress["maelstrom formal wetshirt"] = /obj/item/clothing/under/dressshirt/skrell/maelstrom
|
||||
dress["reef formal wetshirt"] = /obj/item/clothing/under/dressshirt/skrell/reef
|
||||
gear_tweaks += new /datum/gear_tweak/path(dress)
|
||||
|
||||
/datum/gear/uniform/skrell/wetsuit
|
||||
|
||||
@@ -163,7 +163,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
|
||||
uniform["nanotrasen overalls"] = /obj/item/clothing/under/tajaran/nt
|
||||
uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake
|
||||
uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer
|
||||
uniform["adhomian summer pants"] = /obj/item/clothing/under/pants/tajaran
|
||||
uniform["adhomian summer pants"] = /obj/item/clothing/pants/tajaran
|
||||
uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic
|
||||
uniform["raakti shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim
|
||||
uniform["a'lmariist laborer clothes"] = /obj/item/clothing/under/tajaran/dpra
|
||||
|
||||
Reference in New Issue
Block a user