Cloaks, undies, the Antediluvian, and some other bits

code/datums/underwear/bottom.dm

@@ -73,3 +73,8 @@
 	name = "Panties, Thin"
 	icon_state = "thinpanties"
 	has_color = TRUE
+
+/datum/category_item/underwear/bottom/neko
+	name = "Panties, Neko"
+	icon_state = "panties_neko"
+	has_color = TRUE

code/datums/underwear/socks.dm

@@ -189,3 +189,23 @@
 /datum/category_item/underwear/socks/rippedpantyhose
 	name = "Pantyhose, Ripped"
 	icon_state = "rippedpantyhose"
+
+/datum/category_item/underwear/socks/stirrup
+	name = "Normal, stirrup"
+	icon_state = "socks_norm-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stirrup_knee
+	name = "Knee, stirrup"
+	icon_state = "socks_knee-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stirrup_thigh
+	name = "Thigh, stirrup"
+	icon_state = "socks_thigh-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stirrup_thigh_black
+	name = "Black Stirrup Stockings"
+	icon_state = "leggings-stir-black"
+	has_color = TRUE

code/datums/underwear/top.dm

@@ -77,3 +77,17 @@
 	icon_state = "onesleeve"
 	has_color = TRUE
 
+/datum/category_item/underwear/top/neko
+	name = "Neko bra"
+	icon_state = "bra_neko"
+	has_color = TRUE
+
+/datum/category_item/underwear/top/tape
+	name = "Tape"
+	icon_state = "pasties_alt"
+	has_color = TRUE
+
+/datum/category_item/underwear/top/sarashi
+	name = "Sarashi"
+	icon_state = "bandages"
+	has_color = TRUE

code/datums/underwear/undershirts.dm

@@ -207,3 +207,23 @@
 	name = "Dress shirt, masculine"
 	icon_state = "undershirt_dress"
 	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/midriff
+	name = "Tanktop, midriff"
+	icon_state = "tank_midriff"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/midriffshort
+	name = "Tanktop, midriff, short"
+	icon_state = "tank_midriff_short"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/shibari
+	name = "Shibari Binding"
+	icon_state = "shibari"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/leotard
+	name = "Leotard"
+	icon_state = "leotard"
+	has_color = TRUE

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

@@ -147,3 +147,12 @@ Talon pin
 /datum/gear/accessory/maid_corset
 	display_name = "maid corset"
 	path = /obj/item/clothing/accessory/maidcorset
+
+//Antediluvian accessories
+/datum/gear/accessory/antediluvian
+	display_name = "antediluvian bracers"
+	path = /obj/item/clothing/accessory/antediluvian
+
+/datum/gear/accessory/antediluvian/loin
+	display_name = "antediluvian loincloth"
+	path = /obj/item/clothing/accessory/antediluvian/loincloth

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

@@ -64,6 +64,14 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/head/wedding
+	display_name = "wedding veil"
+	path = /obj/item/clothing/head/wedding
+
+/datum/gear/head/wedding/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /*
 Talon hats
 */

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

@@ -28,3 +28,7 @@
 /datum/gear/shoes/singer_yellow
 	display_name = "yellow performer's boots"
 	path = /obj/item/clothing/shoes/boots/singer/yellow
+
+/datum/gear/shoes/antediluvian
+	display_name = "antediluvian legwraps"
+	path = /obj/item/clothing/shoes/antediluvian

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

@@ -156,3 +156,73 @@ Talon winter coat
 /datum/gear/suit/shrine_maiden
 	display_name = "shrine maiden costume"
 	path = /obj/item/clothing/suit/shrine_maiden
+
+//Antediluvian cloak
+/datum/gear/suit/cloak_ante
+	display_name = "cloak, antediluvian"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/antediluvian
+	cost = 1
+
+//Chaplain cloaks
+/datum/gear/suit/cloak_chaplain
+	display_name = "cloak, chaplain"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/chapel
+	cost = 1
+
+/datum/gear/suit/cloak_chaplain/alt
+	display_name = "cloak, chaplain, alt"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/chapel/alt
+	cost = 1
+
+//Half cloak
+/datum/gear/suit/cloak_half
+	display_name = "cloak, half, colorable"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/half
+	cost = 1
+
+/datum/gear/suit/cloak_half/New()
+	gear_tweaks += gear_tweak_free_color_choice
+
+//Shoulder cloak
+/datum/gear/suit/cloak_shoulder
+	display_name = "cloak, shoulder"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/shoulder
+	cost = 1
+
+/datum/gear/suit/cloak_shoulder/New()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/suit/cloak_shoulder_right
+	display_name = "cloak, shoulder right"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/shoulder/right
+	cost = 1
+
+/datum/gear/suit/cloak_shoulder_right/New()
+	gear_tweaks += gear_tweak_free_color_choice
+
+//Mantles, mostly for heads of staff
+/datum/gear/suit/roles/mantle
+	display_name = "mantle, colorable"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/mantle
+	cost = 1
+
+/datum/gear/suit/roles/mantle/New()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/suit/roles/mantles
+	display_name = "mantle selection"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/mantle/cargo
+	cost = 1
+
+/datum/gear/suit/roles/mantles/New()
+	..()
+	var/list/mantles = list(
+		"orange mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cargo,
+		"black mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/security,
+		"white mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/engineering,
+		"purple mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/research,
+		"cyan mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/medical,
+		"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)

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

@@ -222,6 +222,14 @@ Qipao
 	display_name = "qipao, white"
 	path = /obj/item/clothing/under/qipao/white
 
+/datum/gear/uniform/qipao_colorable_alt
+	display_name = "qipao, colorable alt"
+	path = /obj/item/clothing/under/qipao/white/colorable
+
+/datum/gear/uniform/qipao_colorable_alt/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /*
 Bluespace jumpsuit
 */
@@ -330,3 +338,12 @@ Talon jumpsuit
 /datum/gear/uniform/singer_yellow
 	display_name = "yellow singer dress"
 	path = /obj/item/clothing/under/dress/singer/yellow
+
+//Antediluvian corsets from CitRP
+/datum/gear/uniform/antediluvian
+	display_name = "corset, antediluvian"
+	path = /obj/item/clothing/under/dress/antediluvian
+
+/datum/gear/uniform/antediluvianalt
+	display_name = "corset, antediluvian alt"
+	path = /obj/item/clothing/under/dress/antediluvian/sheerless

code/modules/clothing/head/misc_vr.dm

@@ -92,6 +92,11 @@
 	name = "pizza delivery visor"
 	desc = "A fancy visor showing alignment to pizza delivery service. Extremely risky career choice."
 	icon_state = "pizzadelivery"
+
+/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'
 

code/modules/clothing/shoes/miscellaneous_vr.dm

@@ -90,3 +90,12 @@
 	desc = "A pair of olde knight boots."
 	icon_state = "knight_boots2"
 	item_state = "knight_boots2"
+
+//Antediluvian legwraps
+/obj/item/clothing/shoes/antediluvian
+	name = "antediluvian legwraps"
+	desc = "A pair of wraps with gold inlay that cut off around the ankle."
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/mob_vr.dmi'
+	icon_state = "antediluvian"
+	item_state = "antediluvian"

code/modules/clothing/under/accessories/accessory_vr.dm

@@ -436,3 +436,142 @@
 	icon_state = "casinoslave_owned"
 	item_state = "casinoslave_owned"
 	overlay_state = "casinoslave_owned"
+<<<<<<< HEAD
+=======
+
+//The gold trim from one of the qipaos, separated to an accessory to preserve the color
+/obj/item/clothing/accessory/qipaogold
+	name = "gold trim"
+	desc = "Gold trim belonging to a qipao. Why would you remove this?"
+	icon = 'icons/inventory/accessory/item_vr.dmi'
+	icon_override = 'icons/inventory/accessory/mob_vr.dmi'
+	icon_state = "qipaogold"
+	item_state = "qipaogold"
+	overlay_state = "qipaogold"
+
+//Antediluvian accessory set
+/obj/item/clothing/accessory/antediluvian
+	name = "antediluvian bracers"
+	desc = "A pair of metal bracers with gold inlay. They're thin and light."
+	icon = 'icons/inventory/accessory/item_vr.dmi'
+	icon_override = 'icons/inventory/accessory/mob_vr.dmi'
+	icon_state = "antediluvian"
+	item_state = "antediluvian"
+	overlay_state = "antediluvian"
+	body_parts_covered = ARMS
+
+/obj/item/clothing/accessory/antediluvian/loincloth
+	name = "antediluvian loincloth"
+	desc = "A lengthy loincloth that drapes over the loins, obviously. It's quite long."
+	icon_state = "antediluvian_loin"
+	item_state = "antediluvian_loin"
+	overlay_state = "antediluvian_loin"
+	body_parts_covered = LOWER_TORSO
+
+//The cloaks below belong to this _vr file but their sprites are contained in non-_vr icon files due to
+//the way the poncho/cloak equipped() proc works. Sorry for the inconvenience
+/obj/item/clothing/accessory/poncho/roles/cloak/antediluvian
+	name = "antediluvian cloak"
+	desc = "A regal looking cloak of white with specks of gold woven into the fabric."
+	icon_state = "antediluvian_cloak"
+	item_state = "antediluvian_cloak"
+
+//Other clothes that I'm too lazy to port to Polaris
+/obj/item/clothing/accessory/poncho/roles/cloak/chapel
+	name = "bishop's cloak"
+	desc = "An elaborate white and gold cloak."
+	icon_state = "bishopcloak"
+	item_state = "bishopcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/chapel/alt
+	name = "antibishop's cloak"
+	desc = "An elaborate black and gold cloak. It looks just a little bit evil."
+	icon_state = "blackbishopcloak"
+	item_state = "blackbishopcloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/half
+	name = "rough half cloak"
+	desc = "The latest fashion innovations by the Nanotrasen Uniform & Fashion Department have provided the brilliant invention of slicing a regular cloak in half! All the ponce, half the cost!"
+	icon_state = "roughcloak"
+	item_state = "roughcloak"
+	action_button_name = "Adjust Cloak"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/half/update_clothing_icon()
+	. = ..()
+	if(ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_wear_suit()
+
+/obj/item/clothing/accessory/poncho/roles/cloak/half/attack_self(mob/user as mob)
+	if(src.icon_state == initial(icon_state))
+		src.icon_state = "[icon_state]_open"
+		src.item_state = "[item_state]_open"
+		flags_inv = HIDETIE|HIDEHOLSTER
+		to_chat(user, "You flip the cloak over your shoulder.")
+	else
+		src.icon_state = initial(icon_state)
+		src.item_state = initial(item_state)
+		flags_inv = HIDEHOLSTER
+		to_chat(user, "You pull the cloak over your shoulder.")
+	update_clothing_icon()
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shoulder
+	name = "shoulder cloak"
+	desc = "A small cape that primarily covers the left shoulder. Might help you stand out more, not necessarily for the right reasons."
+	icon_state = "cape_left"
+	item_state = "cape_left"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/shoulder/right
+	desc = "A small cape that primarily covers the right shoulder. It might look a tad cooler if it was longer."
+	icon_state = "cape_right"
+	item_state = "cape_right"
+
+//Mantles
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle
+	name = "shoulder mantle"
+	desc = "Not a cloak and not really a cape either, but a silky fabric that rests on the neck and shoulders alone."
+	icon_state = "mantle"
+	item_state = "mantle"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cargo
+	name = "cargo mantle"
+	desc = "A shoulder mantle bearing the colors of the Supply department, with a gold lapel emblazoned upon the front."
+	icon_state = "qmmantle"
+	item_state = "qmmantle"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle/security
+	name = "security mantle"
+	desc = "A shoulder mantle bearing the colors of the Security department, featuring rugged molding around the collar."
+	icon_state = "hosmantle"
+	item_state = "hosmantle"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle/engineering
+	name = "engineering mantle"
+	desc = "A shoulder mantle bearing the colors of the Engineering department, accenting the pristine white fabric."
+	icon_state = "cemantle"
+	item_state = "cemantle"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle/research
+	name = "research mantle"
+	desc = "A shoulder mantle bearing the colors of the Research department, the material slick and hydrophobic."
+	icon_state = "rdmantle"
+	item_state = "rdmantle"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle/medical
+	name = "medical mantle"
+	desc = "A shoulder mantle bearing the general colors of the Medical department, dyed a sterile nitrile cyan."
+	icon_state = "cmomantle"
+	item_state = "cmomantle"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop
+	name = "head of personnel mantle"
+	desc = "A shoulder mantle bearing the colors of the Head of Personnel's uniform, featuring the typical royal blue contrasted by authoritative red."
+	icon_state = "hopmantle"
+	item_state = "hopmantle"
+
+/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap
+	name = "site manager mantle"
+	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"
+>>>>>>> 1976342d32... Merge pull request #14470 from Burrito-Justice/master

code/modules/clothing/under/miscellaneous_vr.dm

@@ -205,6 +205,10 @@
 	icon_state = "qipao_white"
 	item_state = "qipao_white"
 
+/obj/item/clothing/under/qipao/white/colorable
+	name = "qipao"
+	starting_accessories = list(/obj/item/clothing/accessory/qipaogold)
+
 /obj/item/clothing/under/qipao/red
 	name = "red qipao"
 	icon_state = "qipao_red"
@@ -488,3 +492,17 @@
 	item_state = "qipao2"
 	worn_state = "qipao2"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/dress/antediluvian
+	name = "antediluvian corset"
+	desc = "A regal black and gold tight corset with silky sleeves. A sheer bodystocking accompanies it."
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+	icon_state = "antediluvian"
+	item_state = "antediluvian"
+	worn_state = "antediluvian"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/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"