Merge branch 'master' into Kristopher-Uniform-Patreon

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

@@ -99,16 +99,23 @@
 	path = /obj/item/clothing/head/crystalline
 	ckeywhitelist = list("dragontrance")
 
-/datum/gear/lyricalpawsplush
-	name = "Winter Dawn Plushie"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/mammal/lyricalpaws
-	ckeywhitelist = list("lyricalpaws")
-
 /datum/gear/lyricalpawssuit
 	name = "Fleet Commander's Overcoat"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/clothing/suit/hooded/wintercoat/chloe
+	path = /obj/item/clothing/suit/chloe
+	ckeywhitelist = list("lyricalpaws")
+
+/datum/gear/lyricalpawshat
+	name = "Fleet Commander's Beret"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/clothing/head/chloe
+	cost = 0
+	ckeywhitelist = list("lyricalpaws")
+
+datum/gear/darksabresheath
+	name = "Dark Sabre Sheath"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/storage/belt/sabre/chloesabre
 	ckeywhitelist = list("lyricalpaws")
 
 /datum/gear/cherostavikmask

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

@@ -175,12 +175,12 @@
 	name = "Teal Lipstick"
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/lipstick/teal
-	
+
 /datum/gear/lipstick_fuchsia
 	name = "Fuchsia Lipstick"
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/lipstick/fuchsia
-	
+
 /datum/gear/lipstick_navy
 	name = "Navy Blue Lipstick"
 	category = SLOT_IN_BACKPACK
@@ -196,6 +196,46 @@
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/lipstick/white
 
+/datum/gear/nailpolish_red
+	name = "Red Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/red
+
+/datum/gear/nailpolish_blue
+	name = "Blue Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/blue
+
+/datum/gear/nailpolish_aqua
+	name = "Cyan Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/aqua
+
+/datum/gear/nailpolish_black
+	name = "Black Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/black
+
+/datum/gear/nailpolish_white
+	name = "White Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/white
+
+/datum/gear/nailpolish_navy
+	name = "Navy Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/navy
+
+/datum/gear/nailpolish_yellow
+	name = "Yellow Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/yellow
+
+/datum/gear/nailpolish_purple
+	name = "Purple Nail Polish"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/nailpolish/purple
+
 /datum/gear/condom
 	name = "Condom"
 	category = SLOT_IN_BACKPACK

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

@@ -50,8 +50,8 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
 	var/path //item-to-spawn path
 	var/cost = 1 //normally, each loadout costs a single point.
 	var/geargroupID //defines the ID that the gear inherits from the config
-	var/list/restricted_roles
-	var/list/ckeywhitelist
+	var/list/restricted_roles = list()
+	var/list/ckeywhitelist = list()
 	var/restricted_desc
 	var/blacklist_join_equip = FALSE	//If we don't equip this when we join
 

modular_citadel/code/modules/client/preferences.dm

@@ -56,7 +56,6 @@
 datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1)
 	..()
 	character.give_genitals(TRUE)
-	character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially
 	character.ooc_text = features["ooc_text"] //Let's update their flavor_text at least initially
 	character.canbearoused = arousable
 	character.client?.prefs.lewdchem = lewdchem

modular_citadel/code/modules/client/preferences_savefile.dm

@@ -85,6 +85,7 @@
 	WRITE_FILE(S["feature_can_get_preg"], features["can_get_preg"])
 	//flavor text
 	WRITE_FILE(S["feature_flavor_text"], features["flavor_text"])
+	WRITE_FILE(S["feature_silicon_flavor_text"], features["silicon_flavor_text"])
 	WRITE_FILE(S["feature_ooc_text"], features["ooc_text"])
 	//custom job titles
 	WRITE_FILE(S["alt_titles_preferences"], alt_titles_preferences)