shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subcategories cool

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-29 17:14:07 +01:00
parent c15d0de20d
commit 31963b32a4
15 changed files with 88 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/_service.dm
+1
View File
@@ -14,6 +14,7 @@
/datum/gear/head/neethelm
name = "D.A.B. helmet"
path = /obj/item/clothing/head/assu_helmet
subcategory = SUBCATEGORY_HEAD_JOBS
restricted_roles = list("Assistant")
cost = 2
modular_citadel/code/modules/client/loadout/backpack.dm
+1
View File
@@ -1,6 +1,7 @@
/datum/gear/backpack
category = CATEGORY_BACKPACK
subcategory = SUBCATEGORY_BACKPACK_GENERAL
slot = SLOT_IN_BACKPACK
/datum/gear/backpack/plushbox
name = "Plushie Choice Box"
modular_citadel/code/modules/client/loadout/glasses.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/gear/glasses
category = CATEGORY_GLASSES
slot = SLOT_GLASSES
/datum/gear/glasses/blindfold
name = "Blindfold"
modular_citadel/code/modules/client/loadout/gloves.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/gear/gloves
category = CATEGORY_GLOVES
slot = SLOT_GLOVES
/datum/gear/gloves/fingerless
name = "Fingerless Gloves"
modular_citadel/code/modules/client/loadout/hands.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/gear/hands
category = CATEGORY_HANDS
slot = SLOT_HANDS
/datum/gear/hands/cane
name = "Cane"
modular_citadel/code/modules/client/loadout/head.dm
+1
View File
@@ -1,6 +1,7 @@
/datum/gear/head
category = CATEGORY_HEAD
subcategory = SUBCATEGORY_HEAD_GENERAL
slot = SLOT_HEAD
/datum/gear/head/baseball
name = "Ballcap"
modular_citadel/code/modules/client/loadout/mask.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/gear/mask
category = CATEGORY_MASK
slot = SLOT_WEAR_MASK
/datum/gear/mask/balaclava
name = "Balaclava"
modular_citadel/code/modules/client/loadout/neck.dm
+1
View File
@@ -1,6 +1,7 @@
/datum/gear/neck
category = CATEGORY_NECK
subcategory = SUBCATEGORY_NECK_GENERAL
slot = SLOT_NECK
/datum/gear/neck/bluetie
name = "Blue tie"
modular_citadel/code/modules/client/loadout/shoes.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/gear/shoes
category = CATEGORY_SHOES
slot = SLOT_SHOES
/datum/gear/shoes/laceup
name = "Laceup shoes"
modular_citadel/code/modules/client/loadout/suit.dm
+1
View File
@@ -1,6 +1,7 @@
/datum/gear/suit
category = CATEGORY_SUIT
subcategory = SUBCATEGORY_SUIT_GENERAL
slot = SLOT_WEAR_SUIT
/datum/gear/suit/poncho
name = "Poncho"
modular_citadel/code/modules/client/loadout/uniform.dm
+58 -49
View File
@@ -1,36 +1,38 @@
/datum/gear/uniform
category = CATEGORY_UNIFORM
subcategory = SUBCATEGORY_UNIFORM_GENERAL
slot = SLOT_W_UNIFORM
/datum/gear/uniform/suitblack
/datum/gear/uniform/suit
name = "Black suit"
path = /obj/item/clothing/under/suit/black
subcategory = SUBCATEGORY_UNIFORM_SUITS
/datum/gear/uniform/suitgreen
/datum/gear/uniform/suit/green
name = "Green suit"
path = /obj/item/clothing/under/suit/green
/datum/gear/uniform/suitred
/datum/gear/uniform/suit/red
name = "Red suit"
path = /obj/item/clothing/under/suit/red
/datum/gear/uniform/suitcharcoal
/datum/gear/uniform/suit/charcoal
name = "Charcoal suit"
path = /obj/item/clothing/under/suit/charcoal
/datum/gear/uniform/suitnavy
/datum/gear/uniform/suit/navy
name = "Navy suit"
path = /obj/item/clothing/under/suit/navy
/datum/gear/uniform/suitburgundy
/datum/gear/uniform/suit/burgundy
name = "Burgundy suit"
path = /obj/item/clothing/under/suit/burgundy
/datum/gear/uniform/suittan
/datum/gear/uniform/suit/tan
name = "Tan suit"
path = /obj/item/clothing/under/suit/tan
/datum/gear/uniform/suitwhite
/datum/gear/uniform/suit/white
name = "White suit"
path = /obj/item/clothing/under/suit/white
@@ -46,23 +48,24 @@
name = "Mailman's jumpsuit"
path = /obj/item/clothing/under/misc/mailman
/datum/gear/uniform/skirtblack
/datum/gear/uniform/skirt
name = "Black skirt"
path = /obj/item/clothing/under/dress/skirt
subcategory = SUBCATEGORY_UNIFORM_SKIRTS
/datum/gear/uniform/skirtblue
/datum/gear/uniform/skirt/blue
name = "Blue skirt"
path = /obj/item/clothing/under/dress/skirt/blue
/datum/gear/uniform/skirtred
/datum/gear/uniform/skirt/red
name = "Red skirt"
path = /obj/item/clothing/under/dress/skirt/red
/datum/gear/uniform/skirtpurple
/datum/gear/uniform/skirt/purple
name = "Purple skirt"
path = /obj/item/clothing/under/dress/skirt/purple
/datum/gear/uniform/skirtplaid
/datum/gear/uniform/skirt/plaid
name = "Plaid skirt"
path = /obj/item/clothing/under/dress/skirt/plaid
@@ -82,31 +85,32 @@
name = "Orange Schoolgirl Uniform"
path = /obj/item/clothing/under/costume/schoolgirl/orange
/datum/gear/uniform/stripeddress
/datum/gear/uniform/dress
name = "Striped Dress"
path = /obj/item/clothing/under/dress/striped
subcategory = SUBCATEGORY_UNIFORM_DRESSES
/datum/gear/uniform/sundresswhite
/datum/gear/uniform/dress/sun/white
name = "White Sundress"
path = /obj/item/clothing/under/dress/sundress/white
/datum/gear/uniform/sundress
/datum/gear/uniform/dress/sun
name = "Sundress"
path = /obj/item/clothing/under/dress/sundress
/datum/gear/uniform/greendress
/datum/gear/uniform/dress/green
name = "Green Dress"
path = /obj/item/clothing/under/dress/green
/datum/gear/uniform/pinkdress
/datum/gear/uniform/dress/pink
name = "Pink Dress"
path = /obj/item/clothing/under/dress/pink
/datum/gear/uniform/flowerdress
/datum/gear/uniform/dress/orange
name = "Flower Dress"
path = /obj/item/clothing/under/dress/flower
/datum/gear/uniform/sweptskirt
/datum/gear/uniform/skirt/swept
name = "Swept skirt"
path = /obj/item/clothing/under/dress/skirt/swept
@@ -114,97 +118,96 @@
name = "Croptop"
path = /obj/item/clothing/under/croptop
/datum/gear/uniform/yoga
/datum/gear/uniform/pants
name = "Yoga Pants"
path = /obj/item/clothing/under/pants/yoga
subcategory = SUBCATEGORY_UNIFORM_PANTS
/datum/gear/uniform/kilt
name = "Kilt"
path = /obj/item/clothing/under/costume/kilt
/datum/gear/uniform/camoshorts
/datum/gear/uniform/pants/camo
name = "Camo Pants"
path = /obj/item/clothing/under/pants/camo
/datum/gear/uniform/athleticshorts
/datum/gear/uniform/shorts
name = "Athletic Shorts"
path = /obj/item/clothing/under/shorts/red
subcategory = SUBCATEGORY_UNIFORM_SHORTS
/datum/gear/uniform/bjeans
/datum/gear/uniform/pants/bjeans
name = "Black Jeans"
path = /obj/item/clothing/under/pants/blackjeans
/datum/gear/uniform/cjeans
/datum/gear/uniform/pants/cjeans
name = "Classic Jeans"
path = /obj/item/clothing/under/pants/classicjeans
/datum/gear/uniform/khaki
/datum/gear/uniform/pants/khaki
name = "Khaki Pants"
path = /obj/item/clothing/under/pants/khaki
/datum/gear/uniform/wpants
/datum/gear/uniform/pants/white
name = "White Pants"
path = /obj/item/clothing/under/pants/white
/datum/gear/uniform/rpants
/datum/gear/uniform/pants/red
name = "Red Pants"
path = /obj/item/clothing/under/pants/red
/datum/gear/uniform/tpants
/datum/gear/uniform/pants/tan
name = "Tan Pants"
path = /obj/item/clothing/under/pants/tan
/datum/gear/uniform/trpants
/datum/gear/uniform/pants/track
name = "Track Pants"
path = /obj/item/clothing/under/pants/track
/datum/gear/uniform/rippedjeans
/datum/gear/uniform/pants/ripped
name = "Ripped Jeans"
path = /obj/item/clothing/under/pants/jeanripped
/datum/gear/uniform/jeanshort
/datum/gear/uniform/shorts/jean
name = "Jean Shorts"
path = /obj/item/clothing/under/pants/jeanshort
/datum/gear/uniform/denimskirt
/datum/gear/uniform/skirt/denim
name = "Denim Skirt"
path = /obj/item/clothing/under/pants/denimskirt
/datum/gear/uniform/yoga
name = "Yoga Pants"
path = /obj/item/clothing/under/pants/yoga
// Pantsless Sweaters
/datum/gear/uniform/turtleneck
name = "Tactitool Turtleneck"
path = /obj/item/clothing/under/syndicate/cosmetic
/datum/gear/uniform/creamsweater
/datum/gear/uniform/sweater
name = "Cream Commando Sweater"
path = /obj/item/clothing/under/sweater
subcategory = SUBCATEGORY_UNIFORM_SWEATERS
/datum/gear/uniform/blacksweater
/datum/gear/uniform/sweater/black
name = "Black Commando Sweater"
path = /obj/item/clothing/under/sweater/black
/datum/gear/uniform/purpsweater
/datum/gear/uniform/sweater/purple
name = "Purple Commando Sweater"
path = /obj/item/clothing/under/sweater/purple
/datum/gear/uniform/greensweater
/datum/gear/uniform/sweater/green
name = "Green Commando Sweater"
path = /obj/item/clothing/under/sweater/green
/datum/gear/uniform/redsweater
/datum/gear/uniform/sweater/red
name = "Red Commando Sweater"
path = /obj/item/clothing/under/sweater/red
/datum/gear/uniform/bluesweater
/datum/gear/uniform/sweater/blue
name = "Navy Commando Sweater"
path = /obj/item/clothing/under/sweater/blue
/datum/gear/uniform/keyholesweater
/datum/gear/uniform/sweater/keyhole
name = "Keyhole Sweater"
path = /obj/item/clothing/under/misc/keyholesweater
@@ -213,17 +216,17 @@
path = /obj/item/clothing/under/misc/polyjumpsuit
cost = 2
/datum/gear/uniform/polyskirt
/datum/gear/uniform/skirt/poly
name = "Polychromic Jumpskirt"
path = /obj/item/clothing/under/dress/skirt/polychromic
cost = 2
/datum/gear/uniform/polysuit
/datum/gear/uniform/suit/poly
name = "Polychromic Button-up Shirt"
path = /obj/item/clothing/under/misc/poly_shirt
cost = 3
/datum/gear/uniform/polypleated
/datum/gear/uniform/skirt/poly/pleated
name = "Polychromic Pleated Sweaterskirt"
path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
cost = 3
@@ -233,12 +236,12 @@
path = /obj/item/clothing/under/costume/kilt/polychromic
cost = 3
/datum/gear/uniform/polyshorts
/datum/gear/uniform/shorts/poly
name = "Polychromic Shorts"
path = /obj/item/clothing/under/misc/polyshorts
cost = 3
/datum/gear/uniform/polyshortpants
/datum/gear/uniform/shorts/poly/athletic
name = "Polychromic Athletic Shorts"
path = /obj/item/clothing/under/shorts/polychromic
cost = 2
@@ -473,29 +476,35 @@
/datum/gear/uniform/qipao
name = "Qipao, Black"
path = /obj/item/clothing/under/costume/qipao
subcategory = SUBCATEGORY_UNIFORM_DRESSES
cost = 3
/datum/gear/uniform/qipao/white
name = "Qipao, White"
path = /obj/item/clothing/under/costume/qipao/white
subcategory = SUBCATEGORY_UNIFORM_DRESSES
cost = 3
/datum/gear/uniform/qipao/red
name = "Qipao, Red"
path = /obj/item/clothing/under/costume/qipao/red
subcategory = SUBCATEGORY_UNIFORM_DRESSES
cost = 3
/datum/gear/uniform/cheongsam
name = "Cheongsam, Black"
path = /obj/item/clothing/under/costume/cheongsam
subcategory = SUBCATEGORY_UNIFORM_DRESSES
cost = 3
/datum/gear/uniform/cheongsam/white
name = "Cheongsam, White"
path = /obj/item/clothing/under/costume/cheongsam/white
subcategory = SUBCATEGORY_UNIFORM_DRESSES
cost = 3
/datum/gear/uniform/cheongsam/red
name = "Cheongsam, Red"
path = /obj/item/clothing/under/costume/cheongsam/red
subcategory = SUBCATEGORY_UNIFORM_DRESSES
cost = 3