Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/client/preference_setup/global/setting_datums.dm

@@ -266,6 +266,18 @@ var/list/_client_preferences_by_type
 	enabled_description =  "Enabled"
 	disabled_description = "Disabled"
 
+/datum/client_preference/status_indicators
+	description = "Status Indicators"
+	key = "SHOW_STATUS"
+	enabled_description = "Show"
+	disabled_description = "Hide"
+
+/datum/client_preference/status_indicators/toggled(mob/preference_mob, enabled)
+	. = ..()
+	if(preference_mob && preference_mob.plane_holder)
+		var/datum/plane_holder/PH = preference_mob.plane_holder
+		PH.set_vis(VIS_STATUS, enabled)
+
 /********************
 * Staff Preferences *
 ********************/

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -279,3 +279,7 @@
 /datum/gear/accessory/cowledvest
 	display_name = "cowled vest"
 	path = /obj/item/clothing/accessory/cowledvest
+
+/datum/gear/accessory/asymovercoat
+	display_name = "orange asymmetrical overcoat"
+	path = /obj/item/clothing/accessory/asymovercoat

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -366,4 +366,20 @@
 
 /datum/gear/head/jingasa
 	display_name = "jingasa"
-	path = /obj/item/clothing/head/jingasa
+	path = /obj/item/clothing/head/jingasa
+
+/datum/gear/head/sunflower_crown
+	display_name = "sunflower crown"
+	path = /obj/item/clothing/head/sunflower_crown
+
+/datum/gear/head/lavender_crown
+	display_name = "lavender crown"
+	path = /obj/item/clothing/head/lavender_crown
+
+/datum/gear/head/poppy_crown
+	display_name = "poppy crown"
+	path = /obj/item/clothing/head/poppy_crown
+
+/datum/gear/head/rose_crown
+	display_name = "rose crown"
+	path = /obj/item/clothing/head/rose_crown

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -580,4 +580,12 @@
 
 /datum/gear/uniform/yellowswoop
 	display_name = "yellow swooped dress"
-	path = /obj/item/clothing/under/dress/yellowswoop
+	path = /obj/item/clothing/under/dress/yellowswoop
+
+/datum/gear/uniform/greenasym
+	display_name = "green asymmetrical jumpsuit"
+	path = /obj/item/clothing/under/greenasym
+
+/datum/gear/uniform/cyberpunkharness
+	display_name = "cyberpunk strapped harness"
+	path = /obj/item/clothing/under/cyberpunkharness