diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 69535b77b04..0411a67846b 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -67,6 +67,60 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
 
+/obj/item/clothing/under/rank/blueclown
+	name = "blue clown suit"
+	desc = "<i>'BLUE HONK!'</i>"
+	icon_state = "blueclown"
+	item_state = "blueclown"
+	item_color = "blueclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/greenclown
+	name = "green clown suit"
+	desc = "<i>'GREEN HONK!'</i>"
+	icon_state = "greenclown"
+	item_state = "greenclown"
+	item_color = "greenclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/yellowclown
+	name = "yellow clown suit"
+	desc = "<i>'YELLOW HONK!'</i>"
+	icon_state = "yellowclown"
+	item_state = "yellowclown"
+	item_color = "yellowclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/purpleclown
+	name = "purple clown suit"
+	desc = "<i>'PURPLE HONK!'</i>"
+	icon_state = "purpleclown"
+	item_state = "purpleclown"
+	item_color = "purpleclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	
+/obj/item/clothing/under/rank/orangeclown
+	name = "orange clown suit"
+	desc = "<i>'ORANGE HONK!'</i>"
+	icon_state = "orangeclown"
+	item_state = "orangeclown"
+	item_color = "orangeclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	
+/obj/item/clothing/under/rank/rainbowclown
+	name = "rainbow clown suit"
+	desc = "<i>'R A I N B O W HONK!'</i>"
+	icon_state = "rainbowclown"
+	item_state = "rainbowclown"
+	item_color = "rainbowclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
 /obj/item/clothing/under/rank/clown/Initialize()
 	. = ..()
 	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 95211a96005..65480cd113c 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -8,7 +8,12 @@
 	vend_reply = "Thank you for using AutoDrobe!"
 	products = list(/obj/item/clothing/suit/chickensuit = 1,
 		            /obj/item/clothing/head/chicken = 1,
-		            /obj/item/clothing/under/gladiator = 1,
+		            /obj/item/clothing/under/rank/blueclown = 1,
+					/obj/item/clothing/under/rank/greenclown = 1,
+					/obj/item/clothing/under/rank/yellowclown = 1,
+					/obj/item/clothing/under/rank/orangeclown = 1,
+					/obj/item/clothing/under/rank/purpleclown = 1,
+					/obj/item/clothing/under/gladiator = 1,
 					/obj/item/clothing/head/helmet/gladiator = 1,
 					/obj/item/clothing/under/gimmick/rank/captain/suit = 1,
 					/obj/item/clothing/head/flatcap = 1,
@@ -114,12 +119,14 @@
 		              /obj/item/clothing/mask/muzzle = 2)
 	premium = list(/obj/item/clothing/suit/pirate/captain = 2,
 		           /obj/item/clothing/head/pirate/captain = 2,
+				   /obj/item/clothing/under/rank/rainbowclown = 1,
 		           /obj/item/clothing/head/helmet/roman/fake = 1,
 		           /obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
 		           /obj/item/clothing/under/roman = 1,
 		           /obj/item/clothing/shoes/roman = 1,
 		           /obj/item/shield/riot/roman/fake = 1,
-		           /obj/item/skub = 1)
+		           /obj/item/skub = 1,)
+				
 	refill_canister = /obj/item/vending_refill/autodrobe
 
 /obj/machinery/vending/autodrobe/all_access
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 76adebdc11e..2b39acd3d88 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index a12053ae1d7..ef6c9b3f062 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 23541a8e401..eab768be431 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 38d97e0440b..96f67cf7f58 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ