bra (has bugs)

- bras don't appear when spawning with them in the hud although they're selectable
- bras spawn twice when spawning in as a player

code/__DEFINES/inventory.dm

@@ -66,18 +66,20 @@
 #define ITEM_SLOT_SOCKS (1<<19)
 /// Shirt slot
 #define ITEM_SLOT_SHIRT (1<<20)
+/// Bra slot
+#define ITEM_SLOT_BRA (1<<21)
 /// Right ear slot
-#define ITEM_SLOT_EARS_RIGHT (1<<21)
+#define ITEM_SLOT_EARS_RIGHT (1<<22)
 /// Wrist slot
-#define ITEM_SLOT_WRISTS (1<<22)
+#define ITEM_SLOT_WRISTS (1<<23)
 // SPLURT EDIT END
 /// Handcuff slot
-#define ITEM_SLOT_HANDCUFFED (1<<23)
+#define ITEM_SLOT_HANDCUFFED (1<<24)
 /// Legcuff slot (bolas, beartraps)
-#define ITEM_SLOT_LEGCUFFED (1<<24)
+#define ITEM_SLOT_LEGCUFFED (1<<25)
 
 /// Total amount of slots
-#define SLOTS_AMT 25 // Keep this up to date!
+#define SLOTS_AMT 26 // Keep this up to date!
 
 ///Inventory slots that can be blacklisted by a species from being equipped into
 DEFINE_BITFIELD(no_equip_flags, list(

code/__DEFINES/mobs.dm

@@ -687,31 +687,32 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list(
 /// Total number of layers for mob overlays
 /// KEEP THIS UP-TO-DATE OR SHIT WILL BREAK
 /// Also consider updating layers_to_offset
-#define TOTAL_LAYERS 46 // SKYRAT EDIT CHANGE - ORIGINAL: 35
+#define TOTAL_LAYERS 47 // SKYRAT EDIT CHANGE - ORIGINAL: 35
 /// Mutations layer - Tk headglows, cold resistance glow, etc
-#define MUTATIONS_LAYER 46 // SKYRAT EDIT CHANGE - ORIGINAL: 35
+#define MUTATIONS_LAYER 47 // SKYRAT EDIT CHANGE - ORIGINAL: 35
 /// Mutantrace features (tail when looking south) that must appear behind the body parts
-#define BODY_BEHIND_LAYER 45 // SKYRAT EDIT CHANGE - ORIGINAL: 34
+#define BODY_BEHIND_LAYER 46 // SKYRAT EDIT CHANGE - ORIGINAL: 34
 /// Layer for bodyparts that should appear behind every other bodypart - Mostly, legs when facing WEST or EAST
-#define BODYPARTS_LOW_LAYER 44 // SKYRAT EDIT CHANGE - ORIGINAL: 33
+#define BODYPARTS_LOW_LAYER 45 // SKYRAT EDIT CHANGE - ORIGINAL: 33
 /// Layer for most bodyparts, appears above BODYPARTS_LOW_LAYER and below BODYPARTS_HIGH_LAYER
-#define BODYPARTS_LAYER 43 // SKYRAT EDIT CHANGE - ORIGINAL: 32
+#define BODYPARTS_LAYER 44 // SKYRAT EDIT CHANGE - ORIGINAL: 32
 /// Mutantrace features (snout, body markings) that must appear above the body parts
-#define BODY_ADJ_LAYER 42 // SKYRAT EDIT CHANGE - ORIGINAL: 31
+#define BODY_ADJ_LAYER 43 // SKYRAT EDIT CHANGE - ORIGINAL: 31
 /// Underwear, undershirts, socks, eyes, lips(makeup)
-#define BODY_LAYER 41 // SKYRAT EDIT CHANGE - ORIGINAL: 30
+#define BODY_LAYER 42 // SKYRAT EDIT CHANGE - ORIGINAL: 30
 /// Mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
-#define FRONT_MUTATIONS_LAYER 40 // SKYRAT EDIT CHANGE - ORIGINAL: 29
+#define FRONT_MUTATIONS_LAYER 41 // SKYRAT EDIT CHANGE - ORIGINAL: 29
 /// Damage indicators (cuts and burns)
-#define DAMAGE_LAYER 39 // SKYRAT EDIT CHANGE - ORIGINAL: 28
+#define DAMAGE_LAYER 40 // SKYRAT EDIT CHANGE - ORIGINAL: 28
 // SKYRAT EDIT ADDITION START
 /// This layer is used for things that shouldn't be over clothes, but should be over mutations
-#define BODY_FRONT_UNDER_CLOTHES 38
+#define BODY_FRONT_UNDER_CLOTHES 39
 // SKYRAT EDIT ADDITION END
 // SPLURT EDIT undies
-#define UNDERWEAR_LAYER			37
-#define SOCKS_LAYER				36
-#define SHIRT_LAYER				35
+#define UNDERWEAR_LAYER			38
+#define SOCKS_LAYER				37
+#define SHIRT_LAYER				36
+#define BRA_LAYER				35
 // SPLURT EDIT END
 /// Jumpsuit clothing layer
 #define UNIFORM_LAYER 34 // SKYRAT EDIT CHANGE - ORIGINAL: 27 //SPLURT EDIT undies

code/__DEFINES/~~~splurt_defines/hud.dm

@@ -3,5 +3,6 @@
 #define ui_boxers "WEST:6,SOUTH+4:13"
 #define ui_socks "WEST:6,SOUTH+5:15"
 #define ui_shirt "WEST:6,SOUTH+6:17"
+#define ui_bra "WEST+1:8,SOUTH+5:15"
 #define ui_ears_extra "WEST+2:10,SOUTH+4:13"
 #define ui_wrists "WEST+1:8,SOUTH+4:13"

code/__DEFINES/~~~splurt_defines/mobs.dm

@@ -2,5 +2,6 @@
 #define OFFSET_UNDERWEAR "underwear"
 #define	OFFSET_SOCKS "socks"
 #define OFFSET_SHIRT "shirt"
+#define OFFSET_BRA "bra"
 #define OFFSET_WRISTS "wrist"
 //

code/__DEFINES/~~~splurt_defines/strippable.dm

@@ -2,4 +2,5 @@
 #define STRIPPABLE_ITEM_WRISTS "wrists"
 #define STRIPPABLE_ITEM_SOCKS "socks"
 #define STRIPPABLE_ITEM_UNDERSHIRT "undershirt"
+#define STRIPPABLE_ITEM_BRA "bra"
 #define STRIPPABLE_ITEM_UNDERWEAR "underwear"

code/_onclick/hud/human.dm

@@ -286,6 +286,14 @@
 	inv_box.slot_id = ITEM_SLOT_SHIRT
 	extra_inventory += inv_box
 
+	inv_box = new /atom/movable/screen/inventory(null, src)
+	inv_box.name = "bra"
+	inv_box.icon = extra_inventory_ui_style(ui_style)
+	inv_box.icon_state = "bra"
+	inv_box.screen_loc = ui_bra
+	inv_box.slot_id = ITEM_SLOT_BRA
+	extra_inventory += inv_box
+
 	inv_box = new /atom/movable/screen/inventory(null, src)
 	inv_box.name = "right ear"
 	inv_box.icon = extra_inventory_ui_style(ui_style)

code/datums/outfit.dm

@@ -217,7 +217,7 @@
 		w_shirt = w_shirt || initial(undershirt.shirt_obj) //SPLURT EDIT - Extra inventory - original: user.undershirt = initial(undershirt.name)
 
 	if(bra)
-		w_shirt = w_shirt || initial(bra.bra_obj) //SPLURT EDIT - Extra inventory - original: user.bra = initial(bra.name)
+		w_bra = w_bra || initial(bra.bra_obj) //SPLURT EDIT - Extra inventory - original: user.bra = initial(bra.name)
 
 	if(underwear)
 		w_underwear = w_underwear || initial(underwear.briefs_obj) //SPLURT EDIT - Extra inventory - original: user.underwear = initial(underwear.name)
@@ -234,6 +234,8 @@
 		EQUIP_OUTFIT_ITEM(w_socks, ITEM_SLOT_SOCKS)
 	if(w_shirt)
 		EQUIP_OUTFIT_ITEM(w_shirt, ITEM_SLOT_SHIRT)
+	if(w_bra)
+		EQUIP_OUTFIT_ITEM(w_bra, ITEM_SLOT_BRA)
 	if(wrists)
 		EQUIP_OUTFIT_ITEM(wrists, ITEM_SLOT_WRISTS)
 	//

code/game/objects/structures/dresser.dm

@@ -100,18 +100,18 @@
 			if(new_bra)
 				dressing_human.bra = new_bra
 				// SPLURT EDIT ADDITION - Extra Inventory
-				dressing_human.dropItemToGround(dressing_human.w_shirt)
+				dressing_human.dropItemToGround(dressing_human.w_bra)
 				var/datum/sprite_accessory/bra/sprite = SSaccessories.bra_list[new_bra]
-				dressing_human.equip_to_slot_or_del(new sprite.bra_obj(dressing_human), ITEM_SLOT_SHIRT)
+				dressing_human.equip_to_slot_or_del(new sprite.bra_obj(dressing_human), ITEM_SLOT_BRA)
 				// SPLURT EDIT END
 		if("Bra Color")
 			var/new_bra_color = input(dressing_human, "Choose your Bra color", "Bra Color", dressing_human.bra_color) as color|null
 			if(new_bra_color)
 				dressing_human.bra_color = sanitize_hexcolor(new_bra_color)
 				// SPLURT EDIT ADDITION - Extra Inventory
-				var/obj/item/clothing/underwear/shirt/bra = dressing_human.w_shirt
+				var/obj/item/clothing/underwear/shirt/bra = dressing_human.w_bra
 				dressing_human.dropItemToGround(bra)
-				dressing_human.equip_to_slot_or_del(bra, ITEM_SLOT_SHIRT)
+				dressing_human.equip_to_slot_or_del(bra, ITEM_SLOT_BRA)
 				// SPLURT EDIT END
 
 		//SKYRAT EDIT ADDITION END - Colorable Undershirt/Socks/Bras

code/game/objects/structures/mannequin.dm

@@ -46,6 +46,7 @@
 		ITEM_SLOT_UNDERWEAR,
 		ITEM_SLOT_SOCKS,
 		ITEM_SLOT_SHIRT,
+		ITEM_SLOT_BRA,
 		ITEM_SLOT_WRISTS,
 		// SPLURT EDIT END
 	)
@@ -182,6 +183,9 @@
 			if(ITEM_SLOT_SHIRT)
 				default_layer = SHIRT_LAYER
 				default_icon = 'icons/mob/clothing/underwear.dmi'
+			if(ITEM_SLOT_BRA)
+				default_layer = BRA_LAYER
+				default_icon = 'icons/mob/clothing/underwear.dmi'
 			if(ITEM_SLOT_WRISTS)
 				default_layer = WRISTS_LAYER
 				//default_icon = 'modular_zzplurt/icons/mob/clothing/wrists.dmi' //No wrists icon yet

code/modules/antagonists/changeling/changeling.dm

@@ -815,6 +815,7 @@
 		"w_underwear" = ITEM_SLOT_UNDERWEAR,
 		"w_socks" = ITEM_SLOT_SOCKS,
 		"w_shirt" = ITEM_SLOT_SHIRT,
+		"w_bra" = ITEM_SLOT_BRA,
 		"ears_extra" = ITEM_SLOT_EARS_RIGHT,
 		"wrists" = ITEM_SLOT_WRISTS,
 	)

code/modules/clothing/outfits/vv_outfit.dm

@@ -39,6 +39,8 @@
 			wrists = item_path
 		if(ITEM_SLOT_SHIRT)
 			w_shirt = item_path
+		if(ITEM_SLOT_BRA)
+			w_bra = item_path
 		if(ITEM_SLOT_UNDERWEAR)
 			underwear = item_path
 		if(ITEM_SLOT_SOCKS)
@@ -94,7 +96,7 @@
 
 	//Copy equipment
 	var/list/result = list()
-	var/list/slots_to_check = list(ITEM_SLOT_ICLOTHING,ITEM_SLOT_UNDERWEAR,ITEM_SLOT_SHIRT,ITEM_SLOT_SOCKS,ITEM_SLOT_BACK,ITEM_SLOT_OCLOTHING,ITEM_SLOT_BELT,ITEM_SLOT_GLOVES,ITEM_SLOT_WRISTS,ITEM_SLOT_FEET,ITEM_SLOT_HEAD,ITEM_SLOT_MASK,ITEM_SLOT_NECK,ITEM_SLOT_EARS_LEFT,ITEM_SLOT_EARS_RIGHT,ITEM_SLOT_EYES,ITEM_SLOT_ID,ITEM_SLOT_SUITSTORE,ITEM_SLOT_LPOCKET,ITEM_SLOT_RPOCKET) // SPLURT EDIT - Extra inventory
+	var/list/slots_to_check = list(ITEM_SLOT_ICLOTHING,ITEM_SLOT_UNDERWEAR,ITEM_SLOT_SHIRT,ITEM_SLOT_BRA,ITEM_SLOT_SOCKS,ITEM_SLOT_BACK,ITEM_SLOT_OCLOTHING,ITEM_SLOT_BELT,ITEM_SLOT_GLOVES,ITEM_SLOT_WRISTS,ITEM_SLOT_FEET,ITEM_SLOT_HEAD,ITEM_SLOT_MASK,ITEM_SLOT_NECK,ITEM_SLOT_EARS_LEFT,ITEM_SLOT_EARS_RIGHT,ITEM_SLOT_EYES,ITEM_SLOT_ID,ITEM_SLOT_SUITSTORE,ITEM_SLOT_LPOCKET,ITEM_SLOT_RPOCKET) // SPLURT EDIT - Extra inventory
 	for(var/slot in slots_to_check)
 		var/obj/item/item = get_item_by_slot(slot)
 		var/vedits = collect_vv(item)

code/modules/mob/inventory.dm

@@ -493,6 +493,7 @@
 			ITEM_SLOT_UNDERWEAR,\
 			ITEM_SLOT_SOCKS,\
 			ITEM_SLOT_SHIRT,\
+			ITEM_SLOT_BRA,\
 			ITEM_SLOT_ICLOTHING, ITEM_SLOT_OCLOTHING,\
 			ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_NECK,\
 			ITEM_SLOT_FEET, ITEM_SLOT_WRISTS, ITEM_SLOT_GLOVES,\

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

@@ -900,6 +900,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
 			return equip_delay_self_check(I, H, bypass_equip_delay_self)
 		if(ITEM_SLOT_SHIRT)
 			return equip_delay_self_check(I, H, bypass_equip_delay_self)
+		if(ITEM_SLOT_BRA)
+			return equip_delay_self_check(I, H, bypass_equip_delay_self)
 		//
 		if(ITEM_SLOT_ICLOTHING)
 			return equip_delay_self_check(I, H, bypass_equip_delay_self)

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

@@ -77,6 +77,9 @@
 	//SPLURT EDIT - shirt
 	if(w_shirt && !(obscured & ITEM_SLOT_SHIRT) && !(w_shirt.item_flags & EXAMINE_SKIP))
 		. += "[t_He] [t_is] wearing [w_shirt.get_examine_string(user)]."
+	//SPLURT EDIT - bra
+	if(w_bra && !(obscured & ITEM_SLOT_BRA) && !(w_bra.item_flags & EXAMINE_SKIP))
+		. += "[t_He] [t_is] wearing [w_bra.get_examine_string(user)]."
 	//SPLURT EDIT - underwear
 	if(w_underwear && !(obscured & ITEM_SLOT_UNDERWEAR) && !(w_underwear.item_flags & EXAMINE_SKIP))
 		. += "[t_He] [t_is] wearing [w_underwear.get_examine_string(user)]."

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

@@ -632,6 +632,9 @@
 	if(!(obscured & ITEM_SLOT_SHIRT) && w_shirt?.wash(clean_types))
 		update_worn_shirt()
 		. = TRUE
+	if(!(obscured & ITEM_SLOT_BRA) && w_bra?.wash(clean_types))
+		update_worn_bra()
+		. = TRUE
 	if(!(obscured & ITEM_SLOT_WRISTS) && wrists?.wash(clean_types))
 		update_worn_wrists()
 		. = TRUE

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

@@ -28,6 +28,8 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
 	/datum/strippable_item/mob_item_slot/socks,
 	/datum/strippable_item/mob_item_slot/underwear,
 	/datum/strippable_item/mob_item_slot/undershirt,
+	/datum/strippable_item/mob_item_slot/bra,
+	// SPLURT EDIT END
 )))
 
 /mob/living/carbon/human/proc/should_strip(mob/user)

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

@@ -221,6 +221,11 @@
 				return
 			w_shirt = equipping
 			update_worn_shirt()
+		if(ITEM_SLOT_BRA)
+			if(w_bra)
+				return
+			w_bra = equipping
+			update_worn_bra()
 		if(ITEM_SLOT_SOCKS)
 			if(w_socks)
 				return
@@ -297,6 +302,10 @@
 		w_shirt = null
 		if(!QDELETED(src))
 			update_worn_shirt()
+	else if(I == w_bra)
+		w_bra = null
+		if(!QDELETED(src))
+			update_worn_bra()
 	else if(I == wrists)
 		wrists = null
 		if(!QDELETED(src))

code/modules/mob/living/carbon/inventory.dm

@@ -27,7 +27,7 @@
 		obscured |= ITEM_SLOT_HEAD
 	// SPLURT EDIT ADDITION - Extra inventory
 	if(hidden_slots & HIDEUNDERWEAR)
-		obscured |= ITEM_SLOT_UNDERWEAR | ITEM_SLOT_SHIRT | ITEM_SLOT_SOCKS
+		obscured |= ITEM_SLOT_UNDERWEAR | ITEM_SLOT_SHIRT | ITEM_SLOT_BRA | ITEM_SLOT_SOCKS
 	if(hidden_slots & HIDEWRISTS)
 		obscured |= ITEM_SLOT_WRISTS
 	// SPLURT EDIT END

modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm

@@ -165,9 +165,9 @@ GLOBAL_LIST_EMPTY(customizable_races)
 
 		if(species_human.bra && species_human.bra != "Nude")
 			var/datum/sprite_accessory/bra/bra = SSaccessories.bra_list[species_human.bra]
-			if(bra && !species_human.w_shirt)
+			if(bra && !species_human.w_bra)
 				var/obj/item/clothing/underwear/shirt/bra/bra_obj = new bra.bra_obj(species_human)
-				species_human.equip_to_slot_or_del(bra_obj, ITEM_SLOT_SHIRT)
+				species_human.equip_to_slot_or_del(bra_obj, ITEM_SLOT_BRA)
 			/*
 			if(bra)
 				var/mutable_appearance/bra_overlay

modular_zzplurt/code/datums/outfit.dm

@@ -3,8 +3,10 @@
 	var/w_underwear = null
 	///Slot for socks, yes, the thing that usually goes before your shoes
 	var/w_socks = null
-	///Slot for the undershirt (which is quite a foreign concept to me) or bras
+	///Slot for the undershirt (which is quite a foreign concept to me)
 	var/w_shirt = null
+	///Slot for the bra.
+	var/w_bra = null
 	///Slot for the opposite ear.
 	var/ears_extra = null
 	///Slot for the part of your arms that isn't quite hands yet.

modular_zzplurt/code/game/objects/items.dm

@@ -15,6 +15,8 @@
 		owner.update_worn_socks()
 	if(flags & ITEM_SLOT_SHIRT)
 		owner.update_worn_shirt()
+	if(flags & ITEM_SLOT_BRA)
+		owner.update_worn_bra()
 	if(flags & ITEM_SLOT_EARS)
 		owner.update_worn_ears_extra()
 	if(flags & ITEM_SLOT_WRISTS)

modular_zzplurt/code/modules/asset_cache/assets/inventory.dm

@@ -6,6 +6,7 @@
 		"inventory-socks.png" = 'modular_zzplurt/icons/ui/inventory/socks.png',
 		"inventory-undershirt.png" = 'modular_zzplurt/icons/ui/inventory/undershirt.png',
 		"inventory-wrists.png" = 'modular_zzplurt/icons/ui/inventory/wrists.png',
+		"inventory-bra.png" = 'modular_zzplurt/icons/ui/inventory/bra.png',
 	)
 	LAZYADD(assets, extra_assets)
 	. = ..()

modular_zzplurt/code/modules/clothing/underwear/_underwear.dm

@@ -29,6 +29,13 @@
 			return TRUE
 	return FALSE
 
+///Proc to check if bra is hidden.
+/mob/living/carbon/human/proc/bra_hidden()
+	for(var/obj/item/I in list(w_uniform, wear_suit))
+		if(istype(I) && ((I.body_parts_covered & CHEST) || (I.flags_inv & HIDEUNDERWEAR)))
+			return TRUE
+	return FALSE
+
 ///Proc to check if underwear is hidden.
 /mob/living/carbon/human/proc/underwear_hidden()
 	for(var/obj/item/I in list(w_uniform, wear_suit))

modular_zzplurt/code/modules/clothing/underwear/shirt.dm

@@ -8,29 +8,32 @@
 
 /obj/item/clothing/underwear/shirt/equipped(mob/living/user, slot)
 	. = ..()
-	if(!istype(user, /mob/living/carbon/human))
+	if(!istype(user, /mob/living/carbon/human) || istype(src, /obj/item/clothing/underwear/shirt/bra))
 		return
 	var/mob/living/carbon/human/human = user
 	if(slot == ITEM_SLOT_SHIRT)
-		if(istype(src, /obj/item/clothing/underwear/shirt/bra))
-			human.bra = name
-			human.undershirt = "Nude"
-		else
-			human.undershirt = name
-			human.bra = "Nude"
+		human.undershirt = name
 	else
-		if(istype(src, /obj/item/clothing/underwear/shirt/bra))
-			human.bra = "Nude"
-		else
-			human.undershirt = "Nude"
+		human.undershirt = "Nude"
 
 /obj/item/clothing/underwear/shirt/bra
 	name = "bra"
 	desc = "A bra."
 	icon_state = "bra"
 	body_parts_covered = CHEST
+	slot_flags = ITEM_SLOT_BRA
 	female_sprite_flags = NO_FEMALE_UNIFORM
 
+/obj/item/clothing/underwear/shirt/bra/equipped(mob/living/user, slot)
+	. = ..()
+	if(!istype(user, /mob/living/carbon/human))
+		return
+	var/mob/living/carbon/human/human = user
+	if(slot == ITEM_SLOT_BRA)
+		human.bra = name
+	else
+		human.bra = "Nude"
+
 // please make sure they're sorted alphabetically and categorized, above is the only exception
 
 /* Old shirt objects, already handled by the sprite accessories

modular_zzplurt/code/modules/mob/living/carbon/human/human_defines.dm

@@ -3,6 +3,7 @@
 	var/obj/item/clothing/underwear/briefs/w_underwear = null
 	var/obj/item/clothing/underwear/socks/w_socks = null
 	var/obj/item/clothing/underwear/shirt/w_shirt = null
+	var/obj/item/clothing/underwear/shirt/bra/w_bra = null
 	var/obj/item/ears_extra = null
 	var/obj/item/wrists = null
 	//

modular_zzplurt/code/modules/mob/living/carbon/human/human_stripping.dm

@@ -17,3 +17,7 @@
 /datum/strippable_item/mob_item_slot/undershirt
 	key = STRIPPABLE_ITEM_UNDERSHIRT
 	item_slot = ITEM_SLOT_SHIRT
+
+/datum/strippable_item/mob_item_slot/bra
+	key = STRIPPABLE_ITEM_BRA
+	item_slot = ITEM_SLOT_BRA