Merge remote-tracking branch 'upstream/master'

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -57,10 +57,20 @@
 	path = /obj/item/toy/plush/mammal/grug
 	ckeywhitelist = list("herrdoktah")
 
-
 /datum/gear/hshack
 	name = "Plastitanium Shackles"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/suit/shackles
 	ckeywhitelist = list("heliocintrini")
 
+/datum/gear/luwethring
+	name = "Wedding Band"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/clothing/gloves/ring/luweth
+	ckeywhitelist = list("luweth")
+
+/datum/gear/bluedice
+	name = "Blue D20"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/dice/d20/blue
+	ckeywhitelist = list("jackattack41498")

modular_citadel/code/modules/client/loadout/_security.dm

@@ -68,4 +68,32 @@
 	name = "Security Hud"
 	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/hud/security
-	restricted_roles = list("Security Officer", "Warden", "Head of Security")
+	restricted_roles = list("Security Officer", "Warden", "Head of Security")
+
+/datum/gear/pinksec
+	name = "Pink Security Jumpsuit"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/rank/security/pink
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")
+
+/datum/gear/pinksecskirt
+	name = "Pink Security Jumpskirt"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/rank/security/skirt/slut/pink
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")
+
+/datum/gear/secwintercoat
+	name = "Security Winter Coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/security
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")
+
+/datum/gear/pinksecwintercoat
+	name = "Pink Security Winter Coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/security/pink
+	cost = 1
+	restricted_roles = list("Security Officer","Warden","Head of Security")

modular_citadel/code/modules/client/loadout/backpack.dm

@@ -18,6 +18,16 @@
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/slimeplushie
 
+/datum/gear/toy/plush/borgplushie/secdrake
+	name = "SecDrake Plushie"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/toy/plush/borgplushie/secdrake
+
+/datum/gear/toy/plush/borgplushie/meddrake
+	name = "MediDrake Plushie"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/toy/plush/borgplushie/meddrake
+
 /datum/gear/plushlamp
 	name = "Lamp plushie"
 	category = SLOT_IN_BACKPACK
@@ -194,4 +204,16 @@
 /datum/gear/lipstick_white
 	name = "White Lipstick"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/lipstick/white
+	path = /obj/item/lipstick/white
+
+/datum/gear/condom
+	name = "Condom"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/condom
+	cost = 1
+
+/datum/gear/sounding
+	name = "Sounding rod"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/sounding
+	cost = 1

modular_citadel/code/modules/client/loadout/head.dm

@@ -54,6 +54,12 @@
 	path = /obj/item/clothing/head/flakhelm
 	cost = 2
 
+/datum/gear/delinquent //Now you too can become like your favorite punchy ghost protagonist
+	name = "Delinquent Hat"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/delinquent
+	cost = 3
+
 /datum/gear/bunnyears
 	name = "Bunny Ears"
 	category = SLOT_HEAD

modular_citadel/code/modules/client/loadout/shoes.dm

@@ -23,6 +23,11 @@
 	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/jackboots/toeless
 
+/datum/gear/jackboots/tall
+	name = "tall jackboots"
+	category = SLOT_SHOES
+	path = /obj/item/clothing/shoes/jackboots/tall
+
 /datum/gear/winterboots
 	name = "Winter boots"
 	category = SLOT_SHOES
@@ -86,4 +91,4 @@
 datum/gear/highheels
 	name = "High Heels"
 	category = SLOT_SHOES
-	path= /obj/item/clothing/shoes/highheels
+	path= /obj/item/clothing/shoes/highheels

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -38,6 +38,18 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit_jacket/white
 
+/datum/gear/galaxy_b
+	name = "De Void of Soul"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lawyer/galaxy_blue
+	cost = 3
+
+/datum/gear/galaxy_r
+	name = "Pulsar Gonne"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lawyer/galaxy_red
+	cost = 3
+
 /datum/gear/assistantformal
 	name = "Assistant's formal uniform"
 	category = SLOT_W_UNIFORM
@@ -153,6 +165,21 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/track
 
+/datum/gear/redwshort
+	name = "Red workout short"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/shorts/redwshort
+
+/datum/gear/yellowwshort
+	name = "Yellow workout short"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/shorts/yellowwshort
+
+/datum/gear/pinkwshort
+	name = "Pink workout short"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/shorts/pinkwshort
+
 /datum/gear/comfortable
 	name = "Padded Uniform"
 	category =  SLOT_W_UNIFORM
@@ -416,4 +443,10 @@
 	name = "Polychromic Bottomless Shirt"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/polychromic/bottomless
-	cost = 2
+	cost = 2
+
+/datum/gear/corset
+	name = "Corset"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/corset
+	cost = 1