diff --git a/code/datums/underwear/bottom.dm b/code/datums/underwear/bottom.dm
index 92578304ad..7f16ba66b7 100644
--- a/code/datums/underwear/bottom.dm
+++ b/code/datums/underwear/bottom.dm
@@ -77,4 +77,14 @@
 /datum/category_item/underwear/bottom/neko
 	name = "Panties, Neko"
 	icon_state = "panties_neko"
+	has_color = TRUE
+
+/datum/category_item/underwear/bottom/swimbottom
+	name = "Swimming Bottoms"
+	icon_state = "swimbottom"
+	has_color = TRUE
+
+/datum/category_item/underwear/bottom/onepiece
+	name = "Swimming One Piece"
+	icon_state = "onepiece"
 	has_color = TRUE
\ No newline at end of file
diff --git a/code/datums/underwear/top.dm b/code/datums/underwear/top.dm
index eda79da930..5af7870f04 100644
--- a/code/datums/underwear/top.dm
+++ b/code/datums/underwear/top.dm
@@ -90,4 +90,9 @@
 /datum/category_item/underwear/top/sarashi
 	name = "Sarashi"
 	icon_state = "bandages"
+	has_color = TRUE
+
+/datum/category_item/underwear/top/swimtop
+	name = "Swimming Top"
+	icon_state = "swimtop"
 	has_color = TRUE
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
index 62794cbf45..2d4c242ae6 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
@@ -72,6 +72,22 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/head/halo/alt
+	display_name = "halo, alt"
+	path = /obj/item/clothing/head/halo/alt
+
+/datum/gear/head/buckethat
+	display_name = "hat, bucket"
+	path = /obj/item/clothing/head/buckethat
+
+/datum/gear/head/buckethat/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/head/nonla
+	display_name = "hat, non la"
+	path = /obj/item/clothing/head/nonla
+
 /*
 Talon hats
 */
diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm
index 600683d043..0d82eb0efa 100644
--- a/code/modules/client/preference_setup/loadout/loadout_mask.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm
@@ -74,4 +74,11 @@
 	for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
 		var/obj/item/clothing/accessory/gaiter_type = gaiter
 		gaiters[initial(gaiter_type.name)] = gaiter_type
-	gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
\ No newline at end of file
+	gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
+
+/datum/gear/mask/lace
+	display_name = "lace veil"
+	path = /obj/item/clothing/mask/lacemask
+
+/datum/gear/mask/lace/New()
+	gear_tweaks += gear_tweak_free_color_choice
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
index a7fd80961b..95ca1c9414 100644
--- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
@@ -30,5 +30,9 @@
 	path = /obj/item/clothing/shoes/boots/singer/yellow
 
 /datum/gear/shoes/antediluvian
-	display_name = "antediluvian legwraps"
-	path = /obj/item/clothing/shoes/antediluvian
\ No newline at end of file
+	display_name = "legwraps, antediluvian"
+	path = /obj/item/clothing/shoes/antediluvian
+
+/datum/gear/shoes/flats/alt
+	display_name = "flats, alt"
+	path = /obj/item/clothing/shoes/flats/white/color/alt
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index 23bb1afa94..2fc4e5f01d 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -225,4 +225,91 @@ Talon winter coat
 		"blue mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop,
 		"gold mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap
 	)
-	gear_tweaks += new/datum/gear_tweak/path(mantles)
\ No newline at end of file
+	gear_tweaks += new/datum/gear_tweak/path(mantles)
+
+//Boat cloaks
+/datum/gear/suit/roles/boatcloak
+	display_name = "boat cloak, colorable"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/boat
+
+/datum/gear/suit/roles/boatcloak/New()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/suit/roles/capboatcloak
+	display_name = "boat cloak, site manager"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/cap
+	allowed_roles = list("Site Manager")
+
+/datum/gear/suit/roles/hopboatcloak
+	display_name = "boat cloak, head of personnel"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/hop
+	allowed_roles = list("Head of Personnel")
+
+/datum/gear/suit/roles/boatcloaks
+	display_name = "boat cloak selection"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/security
+
+/datum/gear/suit/roles/boatcloaks/New()
+	..()
+	var/list/boatcloaks = list(
+		"security boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/security,
+		"engineering boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/engineering,
+		"atmospherics boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/atmos,
+		"medical boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/medical,
+		"service boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/service,
+		"cargo boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/cargo,
+		"mining boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/mining,
+		"research boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/science
+	)
+	gear_tweaks += new/datum/gear_tweak/path(boatcloaks)
+
+//Shrouds
+/datum/gear/suit/roles/shroud
+	display_name = "shroud, colorable"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud
+
+/datum/gear/suit/roles/shroud/New()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/suit/roles/capshroud
+	display_name = "shroud, site manager"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap
+	allowed_roles = list("Site Manager")
+
+/datum/gear/suit/roles/hopshroud
+	display_name = "shroud, head of personnel"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop
+	allowed_roles = list("Head of Personnel")
+
+/datum/gear/suit/roles/shrouds
+	display_name = "shroud selection"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/security
+
+/datum/gear/suit/roles/shrouds/New()
+	..()
+	var/list/shrouds = list(
+		"security shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/security,
+		"engineering shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/engineering,
+		"atmospherics shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/atmos,
+		"medical shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/medical,
+		"service shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/service,
+		"cargo shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cargo,
+		"mining shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/mining,
+		"research shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/science
+	)
+	gear_tweaks += new/datum/gear_tweak/path(shrouds)
+
+//Actually colorable hoodies
+/datum/gear/suit/roles/choodies
+	display_name = "hoodie selection, colorable"
+	path = /obj/item/clothing/suit/storage/hooded/toggle/colorable
+
+/datum/gear/suit/roles/choodies/New()
+	..()
+	var/list/choodies = list(
+		"normal hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable,
+		"sleeveless hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless,
+		"cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
+	)
+	gear_tweaks += gear_tweak_free_color_choice
+	gear_tweaks += new/datum/gear_tweak/path(choodies)
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
index 980cad6c51..b554e951f2 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
@@ -346,4 +346,27 @@ Talon jumpsuit
 
 /datum/gear/uniform/antediluvianalt
 	display_name = "corset, antediluvian alt"
-	path = /obj/item/clothing/under/dress/antediluvian/sheerless
\ No newline at end of file
+	path = /obj/item/clothing/under/dress/antediluvian/sheerless
+
+//Colorable skirts
+/datum/gear/uniform/coloredskirts
+	display_name = "skirt selection, colorable"
+	path = /obj/item/clothing/under/skirt/colorable
+
+/datum/gear/uniform/coloredskirts/New()
+	..()
+	var/list/skirts = list(
+	"casual skirt"=/obj/item/clothing/under/skirt/colorable,
+	"puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy,
+	"skater skirt"=/obj/item/clothing/under/skirt/colorable/skater,
+	"pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated,
+	"pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil,
+	"plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid,
+	"tube skirt"=/obj/item/clothing/under/skirt/colorable/tube,
+	"long skirt"=/obj/item/clothing/under/skirt/colorable/long,
+	"high skirt"=/obj/item/clothing/under/skirt/colorable/high,
+	"swept skirt"=/obj/item/clothing/under/skirt/colorable/swept,
+	"jumper skirt"=/obj/item/clothing/under/skirt/colorable/jumper,
+	"jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress
+	)
+	gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)
\ No newline at end of file
diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm
index 442e9eefea..fe11d5a900 100644
--- a/code/modules/clothing/head/hood_vr.dm
+++ b/code/modules/clothing/head/hood_vr.dm
@@ -76,3 +76,20 @@
 /obj/item/clothing/head/hood/winter
 	sprite_sheets = list(	SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi',
 							SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi')
+
+//Better hoodies hood
+/obj/item/clothing/head/hood/toggleable
+	name = "super special hood"
+	desc = "This hood is so special that you weren't even supposed to lay eyes on it! Tell a developer!"
+	var/open = FALSE
+
+/obj/item/clothing/head/hood/toggleable/colorable
+	name = "hoodie hood"
+	desc = "It's the hood part of a hoodie. What kind of hoodie would it be without one? A poser, obviously."
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "choodie"
+
+/obj/item/clothing/head/hood/toggleable/colorable/update_icon()
+	. = ..()
+	icon_state = "[initial(icon_state)][open ? "_open" : ""]"
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm
index 323fa9bcda..bd7cb68db9 100644
--- a/code/modules/clothing/head/misc_vr.dm
+++ b/code/modules/clothing/head/misc_vr.dm
@@ -96,9 +96,30 @@
 /obj/item/clothing/head/wedding
 	name = "wedding veil"
 	desc = "A lace veil worn over the face, typically by a bride during their wedding."
-	icon_state = "weddingveil"
 	icon = 'icons/inventory/head/item_vr.dmi'
 	icon_override = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "weddingveil"
+
+/obj/item/clothing/head/halo/alt
+	name = "metal halo"
+	desc = "A halo made of a light metal. This one doesn't float, but it's still a circle on your head!"
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "halo_alt"
+
+/obj/item/clothing/head/buckethat
+	name = "bucket hat"
+	desc = "Turns out these are actually called 'gatsby caps' but telling people you wear a bucket is slightly more interesting, so that's what it's called."
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "buckethat"
+
+/obj/item/clothing/head/nonla
+	name = "non la"
+	desc = "A conical hat typically woven from leaves, good for keeping the sun AND rain off your head, in case it happens to be sunny while raining."
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "nonla"
 
 //////////TALON HATS//////////
 
diff --git a/code/modules/clothing/masks/miscellaneous_vr.dm b/code/modules/clothing/masks/miscellaneous_vr.dm
index 7792ecc8e3..f728dc20fe 100644
--- a/code/modules/clothing/masks/miscellaneous_vr.dm
+++ b/code/modules/clothing/masks/miscellaneous_vr.dm
@@ -1,4 +1,11 @@
 /obj/item/clothing/mask/emotions
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
-		)
\ No newline at end of file
+		)
+
+/obj/item/clothing/mask/lacemask
+	name = "lace mask"
+	desc = "A sheer lace mask that rests above the nose and trails down below the chin."
+	icon = 'icons/inventory/face/item_vr.dmi'
+	icon_state = "lace_mask"
+	icon_override = 'icons/inventory/face/mob_vr.dmi'
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/miscellaneous_vr.dm b/code/modules/clothing/shoes/miscellaneous_vr.dm
index 4a4c17d5cf..f7cd8bd097 100644
--- a/code/modules/clothing/shoes/miscellaneous_vr.dm
+++ b/code/modules/clothing/shoes/miscellaneous_vr.dm
@@ -98,4 +98,11 @@
 	icon = 'icons/inventory/feet/item_vr.dmi'
 	icon_override = 'icons/inventory/feet/mob_vr.dmi'
 	icon_state = "antediluvian"
-	item_state = "antediluvian"
\ No newline at end of file
+	item_state = "antediluvian"
+
+//Alternative flats
+/obj/item/clothing/shoes/flats/white/color/alt
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/mob_vr.dmi'
+	icon_state = "flatsalt"
+	item_state = "flatsalt"
\ No newline at end of file
diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm
index 0921d3b07b..eba5cb2b37 100644
--- a/code/modules/clothing/suits/hooded.dm
+++ b/code/modules/clothing/suits/hooded.dm
@@ -32,8 +32,8 @@
 	..()
 
 /obj/item/clothing/suit/storage/hooded/proc/RemoveHood()
-	icon_state = toggleicon
 	hood_up = FALSE
+	update_icon()
 	hood.canremove = TRUE // This shouldn't matter anyways but just incase.
 	if(ishuman(hood.loc))
 		var/mob/living/carbon/H = hood.loc
@@ -55,16 +55,20 @@
 				to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
 				return
 			else
+				if(color != hood.color)
+					hood.color = color
 				H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
 				hood_up = TRUE
 				hood.canremove = FALSE
-				icon_state = "[toggleicon]_t"
+				update_icon()
 				H.update_inv_wear_suit()
-				if(color != hood.color)
-					hood.color = color
 	else
 		RemoveHood()
 
+/obj/item/clothing/suit/storage/hooded/update_icon()
+	. = ..()
+	icon_state = "[toggleicon][hood_up ? "_t" : ""]"
+
 /obj/item/clothing/suit/storage/hooded/costume
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm
index f2e1fc1f4d..f8a0cc46af 100644
--- a/code/modules/clothing/suits/hooded_vr.dm
+++ b/code/modules/clothing/suits/hooded_vr.dm
@@ -159,3 +159,23 @@
 /obj/item/clothing/suit/storage/hooded/wintercoat
 	sprite_sheets = list(	SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi',
 							SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi')
+
+//Hoodies worth their weight in gold (as in you can unbutton them and toggle the hood independently)
+/obj/item/clothing/suit/storage/hooded/toggle/colorable
+	name = "hoodie"
+	desc = "A rather plain hoodie. If you can't find it in your closet, chances are your significant other is borrowing it."
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
+	icon_state = "choodie"
+	hoodtype = /obj/item/clothing/head/hood/toggleable/colorable
+	open = FALSE
+
+/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless
+	name = "sleeveless hoodie"
+	desc = "Either your arms were too hot or the sleeves vaporized when you gave someone a 'gunshow' with your muscles. Either way, the sleeves are missing."
+	icon_state = "choodie_sleeveless"
+
+/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
+	name = "cropped hoodie"
+	desc = "It's not that this is a size too small, you just like showing off your tum. I guess."
+	icon_state = "choodie_crop"
\ No newline at end of file
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index b962e88e67..7d201bc7d6 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -68,19 +68,27 @@
 
 	if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user
 		open = 0
-		icon_state = initial(icon_state)
+		update_icon()
 		flags_inv = HIDETIE|HIDEHOLSTER
 		to_chat(usr, "You button up the coat.")
 	else if(open == 0)
 		open = 1
-		icon_state = "[icon_state]_open"
+		update_icon()
 		flags_inv = HIDEHOLSTER
 		to_chat(usr, "You unbutton the coat.")
 	else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed
 		to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.")
 		return
-	update_clothing_icon()	//so our overlays update
+	if(istype(hood,/obj/item/clothing/head/hood/toggleable)) //checks if a hood (which you should use) is attached
+		var/obj/item/clothing/head/hood/toggleable/T = hood
+		T.open = open //copy the jacket's open state to the hood
+		T.update_icon(usr) //usr as an arg to fix a weird runtime
+		T.update_clothing_icon()
+	update_clothing_icon() //so our overlays update
 
+/obj/item/clothing/suit/storage/hooded/toggle/update_icon()
+	. = ..()
+	icon_state = "[toggleicon][open ? "_open" : ""][hood_up ? "_t" : ""]"
 
 //New Vest 4 pocket storage and badge toggles, until suit accessories are a thing.
 /obj/item/clothing/suit/storage/vest/heavy/New()
diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm
index 087b669b59..83258f6164 100644
--- a/code/modules/clothing/under/accessories/accessory_vr.dm
+++ b/code/modules/clothing/under/accessories/accessory_vr.dm
@@ -572,3 +572,120 @@
 	desc = "A shoulder mantle bearing the colors usually found on a Site Manager, a commanding blue with regal gold inlay."
 	icon_state = "capmantle"
 	item_state = "capmantle"
+<<<<<<< HEAD
+=======
+
+//Boat cloaks
+/obj/item/clothing/accessory/poncho/roles/cloak/boat
+	name = "boat cloak"
+	desc = "A cloak that might've been worn on boats once or twice. It's just a flappy cape otherwise."
+	icon_state = "boatcloak"
+	item_state = "boatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/cap
+	name = "site manager boat cloak"
+	icon_state = "capboatcloak"
+	item_state = "capboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/hop
+	name = "head of personnel boat cloak"
+	icon_state = "hopboatcloak"
+	item_state = "hopboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/security
+	name = "security boat cloak"
+	icon_state = "secboatcloak"
+	item_state = "secboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/engineering
+	name = "engineering boat cloak"
+	icon_state = "engboatcloak"
+	item_state = "engboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/atmos
+	name = "atmospherics boat cloak"
+	icon_state = "atmosboatcloak"
+	item_state = "atmosboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/medical
+	name = "medical boat cloak"
+	icon_state = "medboatcloak"
+	item_state = "medboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/service
+	name = "service boat cloak"
+	icon_state = "botboatcloak"
+	item_state = "botboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/cargo
+	name = "cargo boat cloak"
+	icon_state = "supboatcloak"
+	item_state = "supboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/mining
+	name = "mining boat cloak"
+	icon_state = "minboatcloak"
+	item_state = "minboatcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/boat/science
+	name = "research boat cloak"
+	icon_state = "sciboatcloak"
+	item_state = "sciboatcloak"
+
+//Shrouds
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud
+	name = "shroud cape"
+	desc = "A sharp looking cape that covers more of one side than the other. Just a bit edgy."
+	icon_state = "shroud"
+	item_state = "shroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap
+	name = "site manager shroud"
+	icon_state = "capshroud"
+	item_state = "capshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop
+	name = "head of personnel shroud"
+	icon_state = "hopshroud"
+	item_state = "hopshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/security
+	name = "security shroud"
+	icon_state = "secshroud"
+	item_state = "secshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/engineering
+	name = "engineering shroud"
+	icon_state = "engshroud"
+	item_state = "engshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/atmos
+	name = "atmospherics shroud"
+	icon_state = "atmosshroud"
+	item_state = "atmosshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/medical
+	name = "medical shroud"
+	icon_state = "medshroud"
+	item_state = "medshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/service
+	name = "service shroud"
+	icon_state = "botshroud"
+	item_state = "botshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cargo
+	name = "cargo shroud"
+	icon_state = "supshroud"
+	item_state = "supshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/mining
+	name = "mining shroud"
+	icon_state = "minshroud"
+	item_state = "minshroud"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shroud/science
+	name = "research shroud"
+	icon_state = "scishroud"
+	item_state = "scishroud"
+>>>>>>> 770f8fb231... Merge pull request #14505 from Burrito-Justice/master
diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm
index 51496674da..196024ef98 100644
--- a/code/modules/clothing/under/miscellaneous_vr.dm
+++ b/code/modules/clothing/under/miscellaneous_vr.dm
@@ -505,4 +505,85 @@
 
 /obj/item/clothing/under/dress/antediluvian/sheerless
 	desc = "A regal black and gold tight corset with silky sleeves. This one is just the corset and sleeves, sans lace stockings and gloves."
-	worn_state = "antediluvian_c"
\ No newline at end of file
+	worn_state = "antediluvian_c"
+
+//Colorable skirts
+/obj/item/clothing/under/skirt/colorable
+	name = "skirt"
+	desc = "A rather plain looking skirt."
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+	icon_state = "skirt_casual"
+	item_state = "skirt_casual"
+	worn_state = "skirt_casual"
+
+/obj/item/clothing/under/skirt/colorable/puffy
+	icon_state = "skirt_puffy"
+	item_state = "skirt_puffy"
+	worn_state = "skirt_puffy"
+
+/obj/item/clothing/under/skirt/colorable/skater
+	desc = "A skirt with loose frills."
+	icon_state = "skirt_skater"
+	item_state = "skirt_skater"
+	worn_state = "skirt_skater"
+
+/obj/item/clothing/under/skirt/colorable/pleated
+	desc = "A short skirt featuring pleat trailing up from the hem."
+	icon_state = "skirt_pleated"
+	item_state = "skirt_pleated"
+	worn_state = "skirt_pleated"
+
+/obj/item/clothing/under/skirt/colorable/pencil
+	name = "pencil skirt"
+	desc = "A short skirt that's almost as thin as a pencil. Almost."
+	icon_state = "skirt_pencil"
+	item_state = "skirt_pencil"
+	worn_state = "skirt_pencil"
+
+/obj/item/clothing/under/skirt/colorable/plaid
+	name = "plaid skirt"
+	desc = "A skirt featuring a plaid pattern."
+	icon_state = "skirt_plaid"
+	item_state = "skirt_plaid"
+	worn_state = "skirt_plaid"
+
+/obj/item/clothing/under/skirt/colorable/tube
+	desc = "A long thin skirt that trails beyond the knees."
+	icon_state = "skirt_tube"
+	item_state = "skirt_tube"
+	worn_state = "skirt_tube"
+
+/obj/item/clothing/under/skirt/colorable/long
+	name = "long skirt"
+	icon_state = "skirt_long"
+	item_state = "skirt_long"
+	worn_state = "skirt_long"
+
+/obj/item/clothing/under/skirt/colorable/high
+	name = "high skirt"
+	desc = "A skirt that rests at the waist instead of the hips."
+	icon_state = "skirt_high"
+	item_state = "skirt_high"
+	worn_state = "skirt_high"
+
+/obj/item/clothing/under/skirt/colorable/swept
+	name = "swept skirt"
+	desc = "A skirt with an angled hem; shorter on one side, longer on the other, like a sweep."
+	icon_state = "skirt_swept"
+	item_state = "skirt_swept"
+	worn_state = "skirt_swept"
+
+/obj/item/clothing/under/skirt/colorable/jumper
+	name = "jumper skirt"
+	desc = "A skirt that's held up by suspenders."
+	icon_state = "skirt_jumper"
+	item_state = "skirt_jumper"
+	worn_state = "skirt_jumper"
+
+/obj/item/clothing/under/skirt/colorable/jumperdress
+	name = "jumper dress"
+	desc = "A dress held up by suspenders. Not quite a skirt anymore."
+	icon_state = "skirt_jumperdress"
+	item_state = "skirt_jumperdress"
+	worn_state = "skirt_jumperdress"
\ No newline at end of file
diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm
index 9ab72130f0..2c771bd456 100644
--- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm
@@ -227,7 +227,7 @@
 		/obj/item/clothing/head/fluff/nikki,
 		/obj/item/clothing/under/skirt/outfit/fluff/nikki,
 		/obj/item/clothing/shoes/fluff/nikki)
-		
+
 // DefiintelyNotARock:Aku Zoles
 /obj/item/weapon/storage/secure/briefcase/dealer
 	name = "Aku's Dealer briefcase"
@@ -299,6 +299,18 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit.
 	name = "Cow Bikini Swimsuit capsule"
 	has_items = list(/obj/item/clothing/under/swimsuit/cowbikini)
 
+/obj/item/weapon/storage/box/fluff/swimsuit/stripperpink
+	name = "Skimpy Pink Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/stripper/stripper_pink)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/strippergreen
+	name = "Skimpy Green Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/stripper/stripper_green)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/mankini
+	name = "Pink Mankini capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/stripper/mankini)
+
 //Monkey boxes for the new primals we have
 /obj/item/weapon/storage/box/monkeycubes/sobakacubes
 	name = "sobaka cube box"
diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi
index 0be80e8ef5..ddda9fff64 100644
Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ
diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi
index 99bf8e66ed..04030363ce 100644
Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ
diff --git a/icons/inventory/face/item_vr.dmi b/icons/inventory/face/item_vr.dmi
index c621b7dadd..e8fe737655 100644
Binary files a/icons/inventory/face/item_vr.dmi and b/icons/inventory/face/item_vr.dmi differ
diff --git a/icons/inventory/face/mob_vr.dmi b/icons/inventory/face/mob_vr.dmi
index fb826bda1d..5181307aa3 100644
Binary files a/icons/inventory/face/mob_vr.dmi and b/icons/inventory/face/mob_vr.dmi differ
diff --git a/icons/inventory/feet/item_vr.dmi b/icons/inventory/feet/item_vr.dmi
index 11f16cfba3..3ac5e1b9f2 100644
Binary files a/icons/inventory/feet/item_vr.dmi and b/icons/inventory/feet/item_vr.dmi differ
diff --git a/icons/inventory/feet/mob_vr.dmi b/icons/inventory/feet/mob_vr.dmi
index 72fb1efec7..1a393e68db 100644
Binary files a/icons/inventory/feet/mob_vr.dmi and b/icons/inventory/feet/mob_vr.dmi differ
diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi
index 2ec42eea27..e7116d9dc7 100644
Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ
diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi
index 52f5e50e15..91c916553a 100644
Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ
diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi
index 47c0fcbd15..40659b94f8 100644
Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ
diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi
index a9fc8c37d4..400e781f9e 100644
Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
index 810911b73a..8d0a1f5e2e 100644
Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ