diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 1a75d508..4c224a51 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -150,6 +150,12 @@ There are several things that need to be remembered:
 			uniform_overlay.pixel_y += dna.species.offset_features[OFFSET_UNIFORM][2]
 		overlays_standing[UNIFORM_LAYER] = uniform_overlay
 
+		if(src.getorganslot("penis")) //they have a penis
+			uniform_overlay.add_overlay(mutable_appearance('hyperstation/icons/mob/clothes/extra.dmi', "[U.icon_state]_penis"))
+		if(src.getorganslot("breasts")) //they have breasts
+			uniform_overlay.add_overlay(mutable_appearance('hyperstation/icons/mob/clothes/extra.dmi', "[U.icon_state]_breasts"))
+
+
 	apply_overlay(UNIFORM_LAYER)
 	update_mutant_bodyparts()
 
diff --git a/hyperstation/code/obj/kinkyclothes.dm b/hyperstation/code/obj/kinkyclothes.dm
index 1d87ad4f..0b8701c4 100644
--- a/hyperstation/code/obj/kinkyclothes.dm
+++ b/hyperstation/code/obj/kinkyclothes.dm
@@ -67,3 +67,23 @@ obj/item/clothing/neck/stole/black
 	body_parts_covered = CHEST|LEGS|ARMS
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/under/latexfull
+	name = "full latex jumpsuit"
+	desc = "A tight fitting jumpsuit made of latex."
+	icon = 'hyperstation/icons/obj/clothing/suits.dmi'
+	icon_state = "latex"
+	alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
+	item_state = "r_suit"
+	can_adjust = FALSE
+	force_alternate_icon = TRUE
+
+/obj/item/clothing/under/latexhalf
+	name = "latex bodysuit"
+	desc = "A tight fitting outfit made of latex, that covers the wearers torso."
+	icon = 'hyperstation/icons/obj/clothing/suits.dmi'
+	icon_state = "latexhalf"
+	alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
+	item_state = "r_suit"
+	can_adjust = FALSE
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
\ No newline at end of file
diff --git a/hyperstation/icons/mob/clothes/extra.dmi b/hyperstation/icons/mob/clothes/extra.dmi
new file mode 100644
index 00000000..e44fe802
Binary files /dev/null and b/hyperstation/icons/mob/clothes/extra.dmi differ
diff --git a/hyperstation/icons/mobs/suits.dmi b/hyperstation/icons/mobs/suits.dmi
index cd3335dd..f1cd24b3 100644
Binary files a/hyperstation/icons/mobs/suits.dmi and b/hyperstation/icons/mobs/suits.dmi differ
diff --git a/hyperstation/icons/obj/clothing/suits.dmi b/hyperstation/icons/obj/clothing/suits.dmi
index 3c73887c..1f0a9ddc 100644
Binary files a/hyperstation/icons/obj/clothing/suits.dmi and b/hyperstation/icons/obj/clothing/suits.dmi differ
diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm
index 88c7e553..25506c16 100644
--- a/modular_citadel/code/game/machinery/vending.dm
+++ b/modular_citadel/code/game/machinery/vending.dm
@@ -60,6 +60,8 @@
 				/obj/item/clothing/under/polychromic/onepeice = 3,
 				/obj/item/clothing/under/polychromic/shortpants/pantsu = 3,
 				/obj/item/clothing/under/polychromic/bulge = 3,
+				/obj/item/clothing/under/latexhalf = 3,
+				/obj/item/clothing/under/latexfull = 3,
 				/obj/item/clothing/suit/maidapron = 3,
 				/obj/item/clothing/under/corset = 3,
 				/obj/item/clothing/under/jabroni = 3,
diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi
index 38f9a4a0..dbf0161f 100644
Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ