Merge branch 'master' into master

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

@@ -20,4 +20,8 @@
 /datum/gear/mask/sterile
 	display_name = "sterile mask"
 	path = /obj/item/clothing/mask/surgical
-	cost = 2
+	cost = 2
+
+/datum/gear/mask/veil
+	display_name = "black veil"
+	path = /obj/item/clothing/mask/veil

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

@@ -556,4 +556,28 @@
 
 /datum/gear/uniform/haltertop
 	display_name = "halter top"
-	path = /obj/item/clothing/under/haltertop
+	path = /obj/item/clothing/under/haltertop
+
+/datum/gear/uniform/revealingdress
+	display_name = "revealing dress"
+	path = /obj/item/clothing/under/dress/revealingdress
+
+/datum/gear/uniform/rippedpunk
+	display_name = "ripped punk jeans"
+	path = /obj/item/clothing/under/rippedpunk
+
+/datum/gear/uniform/gothic
+	display_name = "gothic dress"
+	path = /obj/item/clothing/under/dress/gothic
+
+/datum/gear/uniform/formalred
+	display_name = "formal red dress"
+	path = /obj/item/clothing/under/dress/formalred
+
+/datum/gear/uniform/pentagram
+	display_name = "pentagram dress"
+	path = /obj/item/clothing/under/dress/pentagram
+
+/datum/gear/uniform/yellowswoop
+	display_name = "yellow swooped dress"
+	path = /obj/item/clothing/under/dress/yellowswoop