done

shiptest-ss13 · Sep 21, 2024 · be0c73c · be0c73c
1 parent 21faec6
commit be0c73c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
@@ -1430,7 +1430,7 @@
 /obj/item/clothing/shoes/cowboy,
 /obj/item/clothing/under/rank/security/officer/blueshirt,
 /obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/suit/armor/vest/duster,
+/obj/item/clothing/suit/jacket/leather/duster/black,
 /obj/item/clothing/head/cowboy/sec,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1

diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm
@@ -23,14 +23,14 @@
 	display_name = "leather jacket"
 	path = /obj/item/clothing/suit/jacket/leather
 
-/datum/gear/suit/jacket/leather/overcoat
-	display_name = "leather overcoat"
-	path = /obj/item/clothing/suit/jacket/leather/overcoat
-
 /datum/gear/suit/jacket/leather/duster
 	display_name = "leather duster"
 	path = /obj/item/clothing/suit/jacket/leather/duster
 
+/datum/gear/suit/jacket/leather/duster/black
+	display_name = "black duster"
+	path = /obj/item/clothing/suit/jacket/leather/duster/black
+
 /datum/gear/suit/jacket/military
 	display_name = "military jacket"
 	path = /obj/item/clothing/suit/jacket/miljacket

diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
@@ -76,14 +76,6 @@
 	item_state = "blueshift"
 	custom_premium_price = 750
 
-/obj/item/clothing/suit/armor/vest/duster
-	name = "black duster"
-	desc = "A long, intimidating black coat. This one is reinforced and ideal for protecting its wearer from rain, sun, dust, and bullets."
-	icon_state = "armor_duster"
-	item_state = "duster_sec"
-	cold_protection = CHEST|GROIN|LEGS|ARMS
-	heat_protection = CHEST|GROIN|LEGS|ARMS
-
 /obj/item/clothing/suit/armor/hos
 	name = "armored greatcoat"
 	desc = "A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence."

diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
@@ -425,6 +425,12 @@
 	cold_protection = CHEST|GROIN|ARMS|LEGS
 	supports_variations = VOX_VARIATION
 
+/obj/item/clothing/suit/jacket/leather/duster/black
+	name = "black duster"
+	desc = "A long, intimidating black coat. Ideal for protecting its wearer from rain, sun, and dust."
+	icon_state = "duster_black"
+	item_state = "duster_black"
+
 /obj/item/clothing/suit/jacket/leather/duster/command
 	name = "officer's duster"
 	desc = "A long, supple leather coat. Ideal for protecting its wearer from rain, sun, dust, and paperwork."

diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi