Merge branch 'master' into xantholne-christmas01

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

@@ -63,16 +63,6 @@
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/dildo/custom
 
-/datum/gear/paperbin
-	name = "Paper Bin"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/paper_bin
-
-/datum/gear/crayons
-	name = "Box of crayons"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/storage/crayons
-
 /datum/gear/toykatana
 	name = "Toy Katana"
 	category = SLOT_IN_BACKPACK
@@ -99,4 +89,30 @@
 /datum/gear/tape
 	name = "Spare cassette tape"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/tape/random
+	path = /obj/item/tape/random
+
+/datum/gear/newspaper
+	name = "Newspaper"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/newspaper
+  
+/datum/gear/paperbin
+	name = "Paper Bin"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/paper_bin
+
+/datum/gear/crayons
+	name = "Box of crayons"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/storage/crayons
+
+/datum/gear/multipen
+	name = "A multicolored pen"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/pen/fourcolor
+
+/datum/gear/fountainpen
+	name = "A fancy pen"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/pen/fountain
+	cost = 2

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

@@ -7,3 +7,10 @@
 	name = "Fake moustache"
 	category = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/fakemoustache
+
+/datum/gear/joy
+	name = "Joy mask"
+	category = SLOT_WEAR_MASK
+	path = /obj/item/clothing/mask/joy
+	cost = 9
+	

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

@@ -64,6 +64,11 @@
 	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat
 
+/datum/gear/coat/aformal
+	name = "Assistant's formal winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/aformal
+
 /* Commented out until it is "balanced"
 /datum/gear/coat/sec
 	name = "Security winter coat"
@@ -78,13 +83,11 @@
 	path = /obj/item/clothing/suit/hooded/wintercoat/medical
 	restricted_roles = list("Chief Medical Officer", "Medical Doctor") // Reserve it to Medical Doctors and their boss, the Chief Medical Officer
 
-/* Commented out until there is a Chemistry Winter Coat
-/datum/gear/coat/med/chem
-	name = "Chemistry winter coat"
+/datum/gear/coat/robotics
+	name = "Robotics winter coat"
 	category = SLOT_WEAR_SUIT
-	path = /obj/item/clothing/suit/hooded/wintercoat/medical/chemistry
-	restricted_roles = list("Chief Medical Officer", "Chemist") // Reserve it to Chemists and their boss, the Chief Medical Officer
-*/
+	path = /obj/item/clothing/suit/hooded/wintercoat/robotics
+	restricted_roles = list("Research Director", "Roboticist")
 
 /datum/gear/coat/sci
 	name = "Science winter coat"

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

@@ -73,6 +73,11 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/skirt/purple
 
+/datum/gear/skirtplaid
+	name = "Plaid skirt"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/plaid_skirt
+
 /datum/gear/schoolgirlblue
 	name = "Blue Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
@@ -108,6 +113,11 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/camo
 
+/datum/gear/athleticshorts
+	name = "Athletic Shorts"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/shorts
+
 /datum/gear/bjeans
 	name = "Black Jeans"
 	category = SLOT_W_UNIFORM
@@ -180,6 +190,11 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/bb_sweater/blue
 
+/datum/gear/keyholesweater
+	name =  "Keyhole Sweater"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/keyholesweater
+
 /datum/gear/polykilt
 	name = "Polychromic Kilt"
 	category = SLOT_W_UNIFORM
@@ -334,4 +349,17 @@
 /datum/gear/christmasfemaleg
 	name = "Green Feminine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasfemaleg
+	path = /obj/item/clothing/under/christmas/christmasfemaleg
+
+/datum/gear/pinkstripper
+	name = "Pink stripper outfit"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/stripper_pink
+	cost = 3
+
+/datum/gear/greenstripper
+	name = "Green stripper outfit"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/stripper_green
+	cost = 3
+