Merge branch 'master' into nuclear

Citadel-Station-13 · Oct 8, 2024 · 2885f4d · 2885f4d
2 parents 141461c + aaa9b25
commit 2885f4d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 deletions.
diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm
@@ -40,6 +40,11 @@
 	desc = "A pair of loose, black leather chaps."
 	icon_state = "chaps_black"
 
+/obj/item/clothing/accessory/chaps/unchaps
+	name = "black unchaps"
+	desc = "A pair of loose, black contradictions."
+	icon_state = "unchaps"
+
 /*
  * Poncho
  */

diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
@@ -1258,6 +1258,11 @@
 	desc = "A colorable leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included."
 	icon_state = "leotard_color"
 
+/obj/item/clothing/under/leotardwindow
+	name = "side-window leotard"
+	desc = "A revealing leotard with a window that exposes your sides."
+	icon_state = "leotard_window"
+
 /obj/item/clothing/under/bunnysuit_f
 	name = "bunny leotard (f)"
 	desc = "A black leotard, commonly used by casino workers to drive up tips. Bunny ears and tail sold separately."

diff --git a/code/modules/loadout/loadout_accessories.dm b/code/modules/loadout/loadout_accessories.dm
@@ -113,6 +113,10 @@
 	name = "Chaps - Black"
 	path = /obj/item/clothing/accessory/chaps/black
 
+/datum/loadout_entry/accessory/chaps/unchaps
+	name = "Unchaps - Black"
+	path = /obj/item/clothing/accessory/chaps/unchaps
+
 /datum/loadout_entry/accessory/hawaii
 	name = "Hawaii Shirt"
 	path = /obj/item/clothing/accessory/hawaii

diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm
@@ -526,6 +526,10 @@
 	name = "Colored Leotard"
 	path = /obj/item/clothing/under/leotardcolor
 
+/datum/loadout_entry/uniform/leotardwindow
+	name = "Window Leotard"
+	path = /obj/item/clothing/under/leotardwindow
+
 /datum/loadout_entry/uniform/bunnysuit_f
 	name = "Bunny Leotard - Female"
 	path = /obj/item/clothing/under/bunnysuit_f

diff --git a/icons/mob/clothing/ties.dmi b/icons/mob/clothing/ties.dmi
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi