cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Overalls and Shorts Tweaks (#14987)

Browse Source
This commit is contained in:
SleepyGemmy
2023-02-02 19:01:19 +01:00
committed by GitHub
parent b43aafafc2
commit de47686ec0
46 changed files with 636 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,18 +174,18 @@
cost = 2
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/overalls_mining
display_name = "overalls, mining"
path = /obj/item/clothing/accessory/storage/overalls/mining
allowed_roles = list("Shaft Miner", "Xenoarchaeologist")
cost = 2
/datum/gear/accessory/overalls_engineer
display_name = "overalls, engineering"
path = /obj/item/clothing/accessory/storage/overalls/engineer
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
cost = 2
/datum/gear/accessory/overalls_mining
display_name = "overalls, mining"
path = /obj/item/clothing/accessory/storage/overalls/mining
allowed_roles = list("Shaft Miner", "Xenoarchaeologist")
cost = 2
/datum/gear/accessory/sweater
display_name = "sweater selection"
path = /obj/item/clothing/accessory/sweater

2
code/modules/client/preference_setup/loadout/loadout_factions.dm
View File

@@ -436,7 +436,7 @@
/datum/gear/faction/zenghu_apron
display_name = "zeng-hu vinyl apron"
path = /obj/item/clothing/suit/apron/surgery/zeng
path = /obj/item/clothing/accessory/apron/surgery/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"

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

@@ -1,17 +1,11 @@
// Suit slot
/datum/gear/suit
display_name = "apron, botanist"
path = /obj/item/clothing/suit/apron
display_name = "san colette bridge crew jacket"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc/sancol
slot = slot_wear_suit
sort_category = "Suits and Overwear"
cost = 1
/datum/gear/suit/colorapron
display_name = "apron, multipurpose"
path = /obj/item/clothing/suit/apron/colored
slot = slot_wear_suit
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
datum/gear/suit/colorvest
display_name = "colorable vest"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless/colorable
@@ -58,10 +52,6 @@ datum/gear/suit/colorvest
gear_tweaks += new /datum/gear_tweak/path(jackets)
/datum/gear/suit/sancolette
display_name = "san colette bridge crew jacket"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc/sancol
/datum/gear/suit/hazard_vest
display_name = "hazard vest selection"
path = /obj/item/clothing/suit/storage/hazardvest
@@ -103,15 +93,9 @@ datum/gear/suit/colorvest
path = /obj/item/clothing/suit/storage/toggle/labcoat
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/overalls
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
cost = 1
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/surgeryapron
display_name = "surgical apron"
path = /obj/item/clothing/suit/apron/surgery
path = /obj/item/clothing/accessory/apron/surgery
cost = 1
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
@@ -452,3 +436,36 @@ datum/gear/suit/colorvest
gadpathur_coat["gadpathurian leather coat"] = /obj/item/clothing/suit/storage/toggle/trench/gadpathur/leather
gadpathur_coat["thermal coat"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/gadpathur
gear_tweaks += new /datum/gear_tweak/path(gadpathur_coat)
// Apron
/datum/gear/suit/apron_colourable
display_name = "apron (colourable)"
path = /obj/item/clothing/accessory/apron
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
// Overalls Selection
/datum/gear/suit/overalls
display_name = "overalls selection (colourable)"
path = /obj/item/clothing/accessory/overalls
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/overalls/New()
..()
var/list/overalls = list()
// Overalls
overalls["overalls"] = /obj/item/clothing/accessory/overalls
overalls["overalls, high back"] = /obj/item/clothing/accessory/overalls/high_back
overalls["overalls, x-shaped back"] = /obj/item/clothing/accessory/overalls/x_shaped_back
// Overall Shorts
overalls["overall shorts"] = /obj/item/clothing/accessory/overalls/shorts
overalls["overall shorts, high back"] = /obj/item/clothing/accessory/overalls/shorts/high_back
overalls["overall shorts, x-shaped back"] = /obj/item/clothing/accessory/overalls/shorts/x_shaped_back
// Overall Skirts
overalls["overall skirt"] = /obj/item/clothing/accessory/overalls/skirt
overalls["overall skirt, high back"] = /obj/item/clothing/accessory/overalls/skirt/high_back
overalls["overall skirt, x-shaped back"] = /obj/item/clothing/accessory/overalls/skirt/x_shaped_back
gear_tweaks += new /datum/gear_tweak/path(overalls)

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

@@ -159,16 +159,16 @@
gear_tweaks += new /datum/gear_tweak/path(bridgecrew)
/datum/gear/uniform/pants
display_name = "pants selection"
description = "A selection of 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["jeans"] = /obj/item/clothing/under/pants
pants["jeans"] = /obj/item/clothing/under/pants/jeans
pants["classic jeans"] = /obj/item/clothing/under/pants/classic
pants["must hang jeans"] = /obj/item/clothing/under/pants/musthang
pants["must hang jeans"] = /obj/item/clothing/under/pants/mustang
pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack
pants["young folks jeans"] = /obj/item/clothing/under/pants/youngfolksjeans
pants["white pants"] = /obj/item/clothing/under/pants/white
@@ -186,31 +186,38 @@
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
pants["athletic shorts, black"] = /obj/item/clothing/under/shorts
pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red
pants["athletic shorts, green"] = /obj/item/clothing/under/shorts/green
pants["athletic shorts, black"] = /obj/item/clothing/under/shorts/black
pants["athletic shorts, grey"] = /obj/item/clothing/under/shorts/grey
pants["Stellar Corporate Conglomerate shorts"] = /obj/item/clothing/under/shorts/scc
pants["jean shorts"] = /obj/item/clothing/under/shorts/jeans
pants["jean short shorts"] = /obj/item/clothing/under/shorts/jeans/female
pants["classic jeans shorts"] = /obj/item/clothing/under/shorts/jeans/classic
pants["classic jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/classic/female
pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang
pants["mustang jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/female
pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks
pants["young folks jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/female
pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black
pants["black jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/black/female
pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey
pants["grey jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/grey/female
// 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
// 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 shorts shorts"] = /obj/item/clothing/under/shorts/khaki/female
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["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks
pants["young folks jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/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
gear_tweaks += new /datum/gear_tweak/path(pants)
/datum/gear/uniform/colorpants
display_name = "pants selection (recolorable)"
description = "A selection of recolourable pants."
display_name = "pants and shorts selection (recolourable)"
description = "A selection of recolourable pants and shorts."
path = /obj/item/clothing/under/pants/dress
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -221,8 +228,8 @@
colorpants["dress pants, with belt"] = /obj/item/clothing/under/pants/dress/belt
colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
colorpants["mustang jeans"] = /obj/item/clothing/under/pants/musthangcolour
colorpants["shorts"] = /obj/item/clothing/under/shorts/color
colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable
colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable
colorpants["flared pants"] = /obj/item/clothing/under/pants/flared
gear_tweaks += new /datum/gear_tweak/path(colorpants)