Merge pull request #1384 from Jaybirdnerd/underwear-port

Underwear port (Izac Check)

code/datums/underwear/bottom.dm

@@ -106,3 +106,15 @@
 	name = "Swimming One Piece, Strapless"
 	icon_state = "swim_strapless_onepiece"
 	has_color = TRUE
+
+// YW CHANGES START HERE //
+/datum/category_item/underwear/bottom/beepanties
+	name = "Bee Panties"
+	icon_state = "panties_bee"
+	icon = 'icons/mob/human_yw.dmi'
+
+/datum/category_item/underwear/bottom/boxers_bee
+	name = "Bee Boxers"
+	icon = 'icons/mob/human_yw.dmi'
+	icon_state = "boxers_bee"
+// YW CHANGES END HERE //

code/datums/underwear/socks.dm

@@ -213,3 +213,12 @@
 /datum/category_item/underwear/socks/stirrup_pantyhose
 	name = "Pantyhose, stirrup"
 	icon_state = "pantyhose-stir"
+
+// YW CHANGES BEGIN HERE //
+
+/datum/category_item/underwear/socks/shortthighstripe
+	icon = 'icons/mob/human_yw.dmi'
+	name = "Short Striped Socks"
+	icon_state = "socks_thigh_stripe_short"
+
+// YW CHANGES END HERE //

code/datums/underwear/top.dm

@@ -106,3 +106,19 @@
 	name = "Swimming Top"
 	icon_state = "swimtop"
 	has_color = TRUE
+
+// YW CHANGES BEGIN HERE //
+
+/datum/category_item/underwear/top/ribbon
+	name = "Ribbon Bra"
+	icon_state = "ribbon"
+	icon = 'icons/mob/human_yw.dmi'
+	has_color = TRUE
+
+/datum/category_item/underwear/top/beebra
+	name = "Bee Bra"
+	icon_state = "bra_bee"
+	icon = 'icons/mob/human_yw.dmi'
+	has_color = TRUE
+
+// YW CHANGES END HERE //

code/datums/underwear/undershirts.dm

@@ -252,3 +252,59 @@
 	name = "Leotard"
 	icon_state = "leotard"
 	has_color = TRUE
+
+// YW CHANGES START HERE //
+
+/datum/category_item/underwear/undershirt/alien
+	name = "Alien Shirt"
+	icon_state = "shirt_alien"
+	icon = 'icons/mob/human_yw.dmi'
+	has_color = FALSE
+
+/datum/category_item/underwear/undershirt/pogoman
+	name = "Pogoman Shirt"
+	icon_state = "pogoman"
+	icon = 'icons/mob/human_yw.dmi'
+	has_color = FALSE
+
+/datum/category_item/underwear/undershirt/question
+	name = "Question Mark Shirt"
+	icon_state = "shirt_question"
+	icon = 'icons/mob/human_yw.dmi'
+	has_color = FALSE
+
+/datum/category_item/underwear/undershirt/band
+	name = "Band Tee"
+	icon_state = "band"
+	icon = 'icons/mob/human_yw.dmi'
+
+/datum/category_item/underwear/undershirt/ss13
+	name = "13 Shirt"
+	icon_state = "shirt_ss13"
+	icon = 'icons/mob/human_yw.dmi'
+
+
+/datum/category_item/underwear/undershirt/commie
+	name = "Communism Shirt"
+	icon_state = "shirt_commie"
+	icon = 'icons/mob/human_yw.dmi'
+
+
+/datum/category_item/underwear/undershirt/skull
+	name = "Skull Shirt"
+	icon_state = "shirt_skull"
+	icon = 'icons/mob/human_yw.dmi'
+
+
+/datum/category_item/underwear/undershirt/peace
+	name = "Peace Shirt"
+	icon = 'icons/mob/human_yw.dmi'
+	icon_state = "peace"
+
+
+/datum/category_item/underwear/undershirt/bee
+	name = "Bee Shirt"
+	icon = 'icons/mob/human_yw.dmi'
+	icon_state = "bee_shirt"
+
+// YW CHANGES END HERE //

code/datums/underwear/underwear.dm

@@ -70,4 +70,4 @@
 	var/image/I = image(icon = icon, icon_state = icon_state, layer = layer)
 	for(var/datum/gear_tweak/gt in tweaks)
 		gt.tweak_item(I, metadata && metadata["[gt]"] ? metadata["[gt]"] : gt.get_default())
-	return I
+	return I