diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index 9116e0f7e14..87d04e91908 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -54,6 +54,22 @@
 		jumpclothes[initial(jumps.name)] = jumps
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes))
 
+/datum/gear/uniform/qipao
+	display_name = "qipao"
+	path = /obj/item/clothing/under/qipao
+
+/datum/gear/uniform/qipao/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/uniform/qipao2
+	display_name = "qipao, slim"
+	path = /obj/item/clothing/under/qipao2
+
+/datum/gear/uniform/qipao2/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/uniform/skirt
 	display_name = "skirt selection"
 	path = /obj/item/clothing/under/skirt
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 562950f89a5..9956d69a92b 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -802,6 +802,18 @@ Uniforms and such
 	desc = "It is a dark blue cheongsam dress."
 	icon_state = "cheongsam-darkblue"
 
+/obj/item/clothing/under/qipao
+	name = "qipao"
+	desc = "A traditional Chinese women's garment, typically made from silk."
+	icon_state = "qipao"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/qipao2
+	name = "slim qipao"
+	desc = "A traditional Chinese women's garment, typically made from silk. This one is fairly slim."
+	icon_state = "qipao2"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
 /obj/item/clothing/under/blazer
 	name = "blue blazer"
 	desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
new file mode 100644
index 00000000000..6bf14c70ece
Binary files /dev/null and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
new file mode 100644
index 00000000000..0ad63f54240
Binary files /dev/null and b/icons/obj/clothing/uniforms.dmi differ