ports some clothing from citadel rp + 2 hairs & 2 gradients from skyrat

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

@@ -252,3 +252,15 @@
 /datum/gear/shoes/circuitry
 	display_name = "boots, circuitry (empty)"
 	path = /obj/item/clothing/shoes/circuitry
+
+/datum/gear/shoes/ballet
+	display_name = "pointe shoes"
+	path = /obj/item/clothing/shoes/ballet
+
+/datum/gear/shoes/ballet/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/shoes/halfmoon
+	display_name = "half moon boots"
+	path = /obj/item/clothing/shoes/boots/half_moon

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

@@ -676,3 +676,55 @@
 	"Earth kimono" = /obj/item/clothing/suit/kimono/earth
 	)
 	gear_tweaks += new/datum/gear_tweak/path(kimonos)
+
+//cropped hoodies
+/datum/gear/suit/roles/croppedhoodies
+	display_name = "cropped hoodie selection"
+	path = /obj/item/clothing/suit/storage/croppedhoodie
+
+/datum/gear/suit/roles/croppedhoodies/New()
+	..()
+	var/list/croppedhoodies = list(
+		"cropped hoodie"=/obj/item/clothing/suit/storage/croppedhoodie,
+		"high cropped hoodie"=/obj/item/clothing/suit/storage/croppedhoodie/croppier,
+		"very high cropped hoodie"=/obj/item/clothing/suit/storage/croppedhoodie/croppierer,
+		"super high cropped hoodie"=/obj/item/clothing/suit/storage/croppedhoodie/croppiest
+	)
+	gear_tweaks += gear_tweak_free_color_choice
+	gear_tweaks += new/datum/gear_tweak/path(croppedhoodies)
+
+/datum/gear/suit/drive
+    display_name = "relatable jacket"
+    path = /obj/item/clothing/suit/storage/drive
+
+/datum/gear/suit/motojacket
+    display_name = "motorcycle jacket"
+    path = /obj/item/clothing/suit/storage/toggle/moto_jacket
+
+/datum/gear/suit/punkvest
+    display_name = "punk vest"
+    path = /obj/item/clothing/suit/storage/punkvest
+
+/datum/gear/suit/raincoat
+    display_name = "raincoat"
+    path = /obj/item/clothing/suit/storage/hooded/raincoat
+
+//hooded cloaks
+/datum/gear/suit/roles/hoodedcloaks
+	display_name = "hooded cloak selection"
+	path = /obj/item/clothing/suit/storage/hooded/cloak
+
+/datum/gear/suit/roles/hoodedcloaks/New()
+	..()
+	var/list/hoodedcloaks = list(
+		"hooded maroon cloak"=/obj/item/clothing/suit/storage/hooded/cloak,
+		"hooded winter cloak"=/obj/item/clothing/suit/storage/hooded/cloak/winter,
+		"hooded asymmetric cloak"=/obj/item/clothing/suit/storage/hooded/cloak/asymmetric,
+		"hooded fancy cloak"=/obj/item/clothing/suit/storage/hooded/cloak/fancy
+	)
+	gear_tweaks += new/datum/gear_tweak/path(hoodedcloaks)
+
+//nerdy shirt
+/datum/gear/suit/nerdshirt
+    display_name = "nerdy shirt"
+    path = /obj/item/clothing/suit/nerdshirt

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

@@ -516,3 +516,73 @@
 /datum/gear/uniform/tropical_outfit/blue
 	display_name = "tropical outfit, miami vice"
 	path = /obj/item/clothing/under/tropical/blue
+
+
+//leotards
+/datum/gear/uniform/leotard
+    display_name = "leotard, black"
+    path = /obj/item/clothing/under/leotard
+
+/datum/gear/uniform/leotardcolor
+    display_name = "leotard, colorable"
+    path = /obj/item/clothing/under/leotardcolor
+
+/datum/gear/uniform/leotardcolor/New()
+    ..()
+    gear_tweaks += gear_tweak_free_color_choice
+
+//skinsuits
+/datum/gear/uniform/skinsuits
+	display_name = "skinsuit selection"
+	path = /obj/item/clothing/under/skinsuit
+
+/datum/gear/uniform/skinsuits/New()
+	..()
+	var/list/skinsuits = list(
+	"skinsuit"=/obj/item/clothing/under/skinsuit,
+	"feminine skinsuit"=/obj/item/clothing/under/skinsuit/fem,
+	"gray skinsuit"=/obj/item/clothing/under/skinsuit/gray,
+	"feminine gray skinsuit"=/obj/item/clothing/under/skinsuit/fem/gray,
+	"leotard skinsuit"=/obj/item/clothing/under/skinsuit/leotard,
+	"feminine leotard skinsuit"=/obj/item/clothing/under/skinsuit/fem/leotard,
+	"gray leotard skinsuit"=/obj/item/clothing/under/skinsuit/leotard/gray,
+	"feminine gray leotard skinsuit"=/obj/item/clothing/under/skinsuit/fem/leotard/gray
+	)
+	gear_tweaks += list(new/datum/gear_tweak/path(skinsuits))
+
+//baggy turtlenecks
+/datum/gear/uniform/turtlebaggys
+	display_name = "baggy turtleneck selection"
+	path = /obj/item/clothing/under/turtlebaggy
+
+/datum/gear/uniform/turtlebaggys/New()
+	..()
+	var/list/turtlebaggys = list(
+	"cream baggy turtleneck"=/obj/item/clothing/under/turtlebaggy,
+	"feminine cream baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/cream_fem,
+	"purple baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/purple,
+	"feminine purple baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/purple_fem,
+	"red baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/red,
+	"feminine red baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/red_fem,
+	"blue baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/blue,
+	"feminine blue baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/blue_fem,
+	"green baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/green,
+	"feminine green baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/green_fem,
+	"black baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/black,
+	"feminine black baggy turtleneck"=/obj/item/clothing/under/turtlebaggy/black_fem
+	)
+	gear_tweaks += list(new/datum/gear_tweak/path(turtlebaggys))
+
+//half-moon outfit
+/datum/gear/uniform/halfmoon
+    display_name = "half moon outfit"
+    path = /obj/item/clothing/under/half_moon
+
+//fiend clothes
+/datum/gear/uniform/fiendsuit
+    display_name = "fiendish suit"
+    path = /obj/item/clothing/under/fiendsuit
+
+/datum/gear/uniform/fienddress
+    display_name = "fiendish dress"
+    path = /obj/item/clothing/under/fienddress

code/modules/clothing/head/hood.dm

@@ -216,3 +216,30 @@
 	icon = 'icons/inventory/head/item_vr.dmi'
 	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "hood_plain"
+
+/obj/item/clothing/head/hood/raincoat
+	name = "raincoat hood"
+	desc = "A hood attached to a raincoat."
+	icon_state = "raincoat"
+
+//hooded cloak hoods
+/obj/item/clothing/head/hood/cloak
+    name  = "maroon cloak hood"
+    desc = "A hood attached to a maroon cloak."
+    icon_state = "maroon_cloakhood"
+    flags_inv = HIDEEARS|BLOCKHAIR
+
+/obj/item/clothing/head/hood/cloak/winter
+    name = "winter cloak hood"
+    desc = "A hood attached to a winter cloak."
+    icon_state = "winter_cloakhood"
+
+/obj/item/clothing/head/hood/cloak/asymmetric
+    name = "asymmetric cloak hood"
+    desc = "A hood attached to an asymmetric cloak."
+    icon_state = "royalist_cloakhood"
+
+/obj/item/clothing/head/hood/cloak/fancy
+    name = "fancy cloak hood"
+    desc = "A hood attached to a fancy cloak."
+    icon_state = "hb_cloakhood"

code/modules/clothing/shoes/boots.dm

@@ -252,3 +252,8 @@
 	name = "yellow performer's boots"
 	desc = "These boots were made for dancing."
 	icon_state = "ysing"
+
+/obj/item/clothing/shoes/boots/half_moon
+    name = "half moon boots"
+    desc = "Flexible and tight, these boots ensure the wearer will be leaving a solid impression without sacrificing mobility."
+    icon_state = "half_moon"

code/modules/clothing/shoes/miscellaneous.dm

@@ -249,6 +249,7 @@
 	icon_state = "sneakersred"
 	item_state = "sneakersred"
 
+<<<<<<< HEAD
 // CHOMPedit start - Mech boots with hijacked clown shoes code.
 
 /obj/item/clothing/shoes/mech_shoes
@@ -281,4 +282,11 @@
 		else
 			footstep++
 
-// CHOMPedit end.
+// CHOMPedit end.
+=======
+/obj/item/clothing/shoes/ballet
+	name = "pointe shoes"
+	desc = "These shoes feature long lace straps and flattened off toes. Great for the most elegant of dances!"
+	icon_state = "ballet"
+	item_state = "ballet"
+>>>>>>> e5609adea3... Merge pull request #15092 from PastelPrinceDan/clothingnstuff

code/modules/clothing/suits/hooded.dm

@@ -393,3 +393,41 @@
 	desc = "For those who REALLY love their toasters."
 	icon_state = "techpriest"
 	hoodtype = /obj/item/clothing/head/hood/techpriest
+
+/obj/item/clothing/suit/storage/hooded/raincoat
+    name = "raincoat"
+    desc = "A thin, opaque coat meant to protect you from all sorts of rain. Preferred by outdoorsmen and janitors alike across the rift. Of course, the only type of fluids you'd like to protect yourself from around this place don't rain down from the sky. Usually. Comes with a hood!"
+    icon_state = "raincoat"
+    body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+    flags_inv = HIDEHOLSTER
+    hoodtype = /obj/item/clothing/head/hood/raincoat
+    allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
+	/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit)
+
+
+//hooded cloaks
+/obj/item/clothing/suit/storage/hooded/cloak
+    name = "hooded maroon cloak"
+    desc = "A simple maroon colored cloak."
+    icon_state = "maroon_cloak"
+    body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+    hoodtype = /obj/item/clothing/head/hood/cloak
+
+/obj/item/clothing/suit/storage/hooded/cloak/winter
+    name = "hooded winter cloak"
+    desc = "A simple wool cloak used during winter."
+    icon_state = "winter_cloak"
+    hoodtype = /obj/item/clothing/head/hood/cloak/winter
+
+/obj/item/clothing/suit/storage/hooded/cloak/asymmetric
+    name = "hooded asymmetric cloak"
+    desc = "A blue hooded cloak with an asymmetric design."
+    icon_state = "asymmetric_cloak"
+    hoodtype = /obj/item/clothing/head/hood/cloak/asymmetric
+
+
+/obj/item/clothing/suit/storage/hooded/cloak/fancy
+    name = "hooded fancy cloak"
+    desc = "A fancy black hooded cloak."
+    icon_state = "hb_cloak"
+    hoodtype = /obj/item/clothing/head/hood/cloak/fancy

code/modules/clothing/suits/miscellaneous.dm

@@ -321,6 +321,12 @@
 	body_parts_covered = UPPER_TORSO|ARMS
 	flags_inv = HIDETIE|HIDEHOLSTER
 
+//nerdy shirt
+/obj/item/clothing/suit/nerdshirt
+	name = "nerdy shirt"
+	desc = "A comfy white t-shirt with a picture of a cartoon hedgehog on it. Although clean, it still seems like the wearer should be embarrassed for owning it."
+	icon_state = "nerdshirt"
+
 /*
  * Kimonos
  */
@@ -1050,3 +1056,45 @@
 	body_parts_covered = FEET|LOWER_TORSO|UPPER_TORSO|LEGS
 	flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
 	item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat")
+
+//Cropped hoodies
+/obj/item/clothing/suit/storage/croppedhoodie
+	name = "cropped hoodie"
+	desc = "This style of hoodie is sometimes worn by those who cannot fit, or choose not to hide their delectable bellies under the full, soft confines of a hoodie. The hood is cosmetic, and non-functional."
+	icon_state = "croppedhoodie"
+	body_parts_covered = UPPER_TORSO|ARMS
+
+/obj/item/clothing/suit/storage/croppedhoodie/croppier
+    name = "high cropped hoodie"
+    desc = "This style of hoodie is worn by those that wish to display ample amounts of midriff, or never threw out their childhood apparel. The hood is cosmetic, and non-functional."
+    icon_state = "croppierhoodie"
+
+/obj/item/clothing/suit/storage/croppedhoodie/croppierer
+    name = "very high cropped hoodie"
+    desc = "This style of hoodie is worn by those that wish to display ample amounts of underboob, and love the breeze. Comes with a free 'functionally_nude' sticker. The hood is cosmetic, and non-functional."
+    icon_state = "highcrophoodie"
+
+/obj/item/clothing/suit/storage/croppedhoodie/croppiest
+    name = "super cropped hoodie"
+    desc = "This style of hoodie is worn by those that have little respect for the concept of a hoodie. Often seen in nightclubs and your daughter's wardrdobe. The hood is cosmetic, and non-functional."
+    icon_state = "supercroppedhoodie"
+
+//Drive jacket
+/obj/item/clothing/suit/storage/drive
+	name = "relatable jacket"
+	desc = "An all white jacket with a shine. It seems easy to identify with the wearer."
+	icon_state = "drivejacket"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/suit/storage/toggle/moto_jacket
+	name = "motorcycle jacket"
+	desc = "A recreation of one of the famous Sol-based biwheeled driver assemblies. Patches on the back denote an AI-generated 'biker logo'. It looks unintelligible."
+	icon_state = "motojacket"
+	allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) //same as leather jackets
+	body_parts_covered = UPPER_TORSO|ARMS
+
+/obj/item/clothing/suit/storage/punkvest
+    name = "punk vest"
+    desc = "For the spiritual rebels that nevertheless wish to conform to standard goth trends. You're totally showing them your anti-authority spunk."
+    icon_state = "punkvest"
+    body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO

code/modules/clothing/under/miscellaneous.dm

@@ -1076,6 +1076,21 @@
 	desc = "A rather skimpy cow patterned swimsuit."
 	icon_state = "swim_cow"
 
+/obj/item/clothing/under/swimsuit/highclass
+    name = "high class swimsuit"
+    desc = "An elegant swimsuit with a white bikini top and black bikini bottom. Thin black silk drapes down the back and goes to the upper thighs, and authentic gold rings hold the top together at the bust and back."
+    icon_state = "swim_highclass"
+
+/obj/item/clothing/under/swimsuit/risque
+    name = "risque swimsuit"
+    desc = "This fits a bit too snug in all the right places. Comes with a collar, for inscrutable reasons."
+    icon_state = "swim_risque"
+
+/obj/item/clothing/under/swimsuit/streamlined
+    name = "streamlined swimsuit"
+    desc = "An all white one-piece that maintains modesty without sacrificing class."
+    icon_state = "swim_stream"
+
 /obj/item/clothing/under/wetsuit
 	name = "wetsuit"
 	desc = "For when you need to scuba dive your way into an enemy base."
@@ -1524,3 +1539,132 @@
 	name = "green crop-top christmas suit"
 	desc = "A simple green christmas suit that doesn't quite looks like Mrs Claus'. Smells minty!"
 	icon_state = "christmascroppedgreen"
+
+//leotards
+/obj/item/clothing/under/leotard
+    name = "black leotard"
+    desc = "A black leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included."
+    icon_state = "leotard"
+
+/obj/item/clothing/under/leotardcolor
+    name = "colored leotard"
+    desc = "A colorable leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included."
+    icon_state = "leotard_color"
+
+//skinsuits
+/obj/item/clothing/under/skinsuit
+	name = "skinsuit"
+	desc = "Similar to other form-fitting latex bodysuits in design and function, skinsuits typically feature integrated hardpoints around common wear areas."
+	icon_state = "skinsuit"
+
+/obj/item/clothing/under/skinsuit/gray
+    name = "gray skinsuit"
+    icon_state = "skinsuit_g"
+
+/obj/item/clothing/under/skinsuit/leotard
+    name = "leotard skinsuit"
+    desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations."
+    icon_state = "skinsuitleo"
+
+
+/obj/item/clothing/under/skinsuit/leotard/gray
+    name = "gray leotard skinsuit"
+    icon_state = "skinsuitleo_g"
+
+/obj/item/clothing/under/skinsuit/fem
+	name = "feminine skinsuit"
+	desc = "Similar to other form-fitting latex bodysuits in design and function, skinsuits typically feature integrated hardpoints around common wear areas."
+	icon_state = "skinsuitfem"
+
+/obj/item/clothing/under/skinsuit/fem/gray
+    name = "feminine gray skinsuit"
+    icon_state = "skinsuitfem_g"
+
+/obj/item/clothing/under/skinsuit/fem/leotard
+    name = "feminine leotard skinsuit"
+    desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations."
+    icon_state = "skinsuitfemleo"
+
+/obj/item/clothing/under/skinsuit/fem/leotard/gray
+    name = "feminine gray leotard skinsuit"
+    icon_state = "skinsuitfemleo_g"
+
+//baggy turtlenecks
+/obj/item/clothing/under/turtlebaggy
+	name = "cream baggy turtleneck (cream)"
+	desc = "A cozy knit turtleneck. It's too baggy and comfortable to be tactical."
+	icon_state = "bb_turtle"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+
+/obj/item/clothing/under/turtlebaggy/cream_fem
+    name = "feminine cream baggy turtleneck"
+    icon_state = "bb_turtle_fem"
+
+
+/obj/item/clothing/under/turtlebaggy/purple
+    name = "purple baggy turtleneck"
+    icon_state = "bb_turtlepur"
+
+
+/obj/item/clothing/under/turtlebaggy/purple_fem
+    name = "feminine purple baggy turtleneck"
+    icon_state = "bb_turtlepur_fem"
+
+
+/obj/item/clothing/under/turtlebaggy/red
+    name = "red baggy turtleneck"
+    icon_state = "bb_turtlered"
+
+
+/obj/item/clothing/under/turtlebaggy/red_fem
+    name = "feminine red baggy turtleneck"
+    icon_state = "bb_turtlered_fem"
+
+
+/obj/item/clothing/under/turtlebaggy/blue
+    name = "blue baggy turtleneck"
+    icon_state = "bb_turtleblu"
+
+
+/obj/item/clothing/under/turtlebaggy/blue_fem
+    name = "feminine blue baggy turtleneck"
+    icon_state = "bb_turtleblu_fem"
+
+
+/obj/item/clothing/under/turtlebaggy/green
+    name = "green baggy turtleneck"
+    icon_state = "bb_turtlegrn"
+
+
+/obj/item/clothing/under/turtlebaggy/green_fem
+    name = "feminine green baggy turtleneck"
+    icon_state = "bb_turtlegrn_fem"
+
+
+/obj/item/clothing/under/turtlebaggy/black
+    name = "black baggy turtleneck"
+    icon_state = "bb_turtleblk"
+
+
+/obj/item/clothing/under/turtlebaggy/black_fem
+    name = "feminine black baggy turtleneck"
+    icon_state = "bb_turtleblk_fem"
+
+//half-moon outfit
+/obj/item/clothing/under/half_moon
+    name = "half moon outfit"
+    desc = "This eminently fashionable outfit consists of a tailored latex leotard and daringly cut white shorts. Paired with plunging off-color stockings, it's to die for."
+    icon_state = "half_moon"
+
+//fiend clothes
+/obj/item/clothing/under/fiendsuit
+    name = "fiendish suit"
+    desc = "A red and black suit befitting someone from the dark pits themselves… Or someone way too edgy."
+    icon_state = "fiendsuit"
+
+
+/obj/item/clothing/under/fienddress
+    name = "fiendish dress"
+    desc = "A red and black dress befitting someone from the dark pits themselves… Or someone way too edgy."
+    icon_state = "fienddress"

code/modules/economy/vending_machines_vr.dm

@@ -946,6 +946,9 @@
 					/obj/item/weapon/storage/box/fluff/swimsuit/security = 5,
 					/obj/item/weapon/storage/box/fluff/swimsuit/medical = 5,
 					/obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 5,
+					/obj/item/weapon/storage/box/fluff/swimsuit/highclass = 5,
+					/obj/item/weapon/storage/box/fluff/swimsuit/risque = 5,
+					/obj/item/weapon/storage/box/fluff/swimsuit/streamlined = 5,
 					/obj/item/clothing/under/utility = 5,
 					/obj/item/clothing/under/utility/grey = 5,
 					/obj/item/clothing/under/utility/blue = 5,
@@ -1121,6 +1124,9 @@
 					/obj/item/weapon/storage/box/fluff/swimsuit/security = 50,
 					/obj/item/weapon/storage/box/fluff/swimsuit/medical = 50,
 					/obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 50,
+					/obj/item/weapon/storage/box/fluff/swimsuit/highclass = 50,
+					/obj/item/weapon/storage/box/fluff/swimsuit/risque = 50,
+					/obj/item/weapon/storage/box/fluff/swimsuit/streamlined = 50,
 					/obj/item/clothing/under/utility = 50,
 					/obj/item/clothing/under/utility/grey = 50,
 					/obj/item/clothing/under/utility/blue = 50,
@@ -2190,6 +2196,9 @@
 					/obj/item/weapon/storage/box/fluff/swimsuit/security = 5,
 					/obj/item/weapon/storage/box/fluff/swimsuit/medical = 5,
 					/obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 5,
+					/obj/item/weapon/storage/box/fluff/swimsuit/highclass = 5,
+					/obj/item/weapon/storage/box/fluff/swimsuit/risque = 5,
+					/obj/item/weapon/storage/box/fluff/swimsuit/streamlined = 5,
 					/obj/item/clothing/under/utility = 5,
 					/obj/item/clothing/under/utility/grey = 5,
 					/obj/item/clothing/under/utility/blue = 5,

code/modules/mob/living/carbon/human/gradient.dm

@@ -10,5 +10,7 @@ GLOBAL_LIST_INIT(hair_gradients, list(
 	"Reflected (Inverted)" = "reflected_inverse",
 	"Reflected High" = "reflected_high",
 	"Reflected High (Inverted)" = "reflected_inverse_high",
-	"Wavy" = "wavy"
+	"Wavy" = "wavy",
-	))
+	"Striped" = "striped",
+	"Striped (Vertical)" = "striped_vertical"
+	))

code/modules/mob/new_player/sprite_accessories.dm

@@ -411,6 +411,10 @@
 	name = "Devil Lock"
 	icon_state = "hair_devilock"
 
+/datum/sprite_accessory/hair/diagonalbangs
+	name = "Diagonal Bangs"
+	icon_state = "hair_diagonalbangs"
+
 /datum/sprite_accessory/hair/dirk
 	name = "Dirk"
 	icon_state = "hair_dirk"
@@ -1187,6 +1191,11 @@
 	icon_state = "hair_volaju"
 	flags = HAIR_TIEABLE
 
+/datum/sprite_accessory/hair/volaju_pompless
+	name = "Volaju, pompless"
+	icon_state = "hair_volajupompless"
+	flags = HAIR_TIEABLE
+
 /datum/sprite_accessory/hair/wisp
 	name = "Wisp"
 	icon_state = "hair_wisp"

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -311,6 +311,18 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit.
 	name = "Pink Mankini capsule"
 	has_items = list(/obj/item/clothing/under/swimsuit/stripper/mankini)
 
+/obj/item/weapon/storage/box/fluff/swimsuit/highclass
+	name = "High Class Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/highclass)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/risque
+	name = "Risque Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/risque)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/streamlined
+	name = "Streamlined Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/streamlined)
+
 //Monkey boxes for the new primals we have
 /obj/item/weapon/storage/box/monkeycubes/sobakacubes
 	name = "sobaka cube box"