Merge branch 'master' into tinytweaks

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
@@ -104,4 +94,25 @@
 /datum/gear/newspaper
 	name = "Newspaper"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/newspaper
+	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/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
@@ -313,4 +328,17 @@
 /datum/gear/gear_harnesses
 	name = "Gear Harness"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/gear_harness
+	path = /obj/item/clothing/under/gear_harness
+
+/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
+	

modular_citadel/code/modules/client/preferences.dm

@@ -15,7 +15,7 @@
 	var/arousable = TRUE
 	var/widescreenpref = TRUE
 	var/autostand = TRUE
-	var/lewdchem = TRUE
+	var/lewdchem = FALSE
 
 	//vore prefs
 	var/toggleeatingnoise = TRUE