From c1d8e0080c9705db8ad566cdb4c9618bde3e4e70 Mon Sep 17 00:00:00 2001 From: BoomerThor <121932955+BoomerThor@users.noreply.github.com> Date: Mon, 10 Jun 2024 07:52:40 -0400 Subject: [PATCH] Detective trenchcoat fix (#19398) Fixes #18627 --- code/modules/client/preference_setup/loadout/items/suit.dm | 4 ++-- code/modules/clothing/suits/jobs.dm | 5 +++-- html/changelogs/BoomerThor - Detective trenchcoat fix.yml | 6 ++++++ maps/aurora/aurora-5_interstitial.dmm | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/BoomerThor - Detective trenchcoat fix.yml diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index d2a14cbdc0f..52c90f718e6 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -212,8 +212,8 @@ coat["trenchcoat, dark brown"] = /obj/item/clothing/suit/storage/toggle/trench/alt coat["trenchcoat, grey alternate"] = /obj/item/clothing/suit/storage/toggle/trench/grey_alt coat["trenchcoat, green"] = /obj/item/clothing/suit/storage/toggle/trench/green - coat["brown trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench - coat["black trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench/black + coat["brown trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/trench/det_trench + coat["black trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/trench/det_trench/black gear_tweaks += new /datum/gear_tweak/path(coat) /datum/gear/suit/trenchcoat_colorable diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 7275410cb01..0d8ce435255 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -150,7 +150,7 @@ icon_state = "idris_warden_coat" item_state = "idris_warden_coat" -/obj/item/clothing/suit/storage/toggle/det_trench // Not security anymore, but used in the loadout. +/obj/item/clothing/suit/storage/toggle/trench/det_trench // Not security anymore, but used in the loadout. name = "brown trenchcoat" desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Perfect for your next act of autodefenestration!" icon_state = "detective" @@ -159,9 +159,10 @@ body_parts_covered = UPPER_TORSO|ARMS allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder,/obj/item/clothing/accessory/badge/investigator) -/obj/item/clothing/suit/storage/toggle/det_trench/black +/obj/item/clothing/suit/storage/toggle/trench/det_trench/black name = "black trenchcoat" icon_state = "detective2" + item_state = "detective2" //Lawyer diff --git a/html/changelogs/BoomerThor - Detective trenchcoat fix.yml b/html/changelogs/BoomerThor - Detective trenchcoat fix.yml new file mode 100644 index 00000000000..58548c8af59 --- /dev/null +++ b/html/changelogs/BoomerThor - Detective trenchcoat fix.yml @@ -0,0 +1,6 @@ +author: BoomerThor + +delete-after: True + +changes: + - bugfix: "Fixes the detective trenchcoats to display the proper sprites." diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 15809aa78de..b3d01bc6d7d 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -3074,7 +3074,7 @@ pixel_x = -9; pixel_y = -7 }, -/obj/item/clothing/suit/storage/toggle/det_trench, +/obj/item/clothing/suit/storage/toggle/trench/det_trench, /obj/effect/decal/remains, /turf/simulated/floor/plating, /area/maintenance/security_interstitial) @@ -6307,7 +6307,7 @@ dir = 1 }, /obj/item/handcuffs, -/obj/item/clothing/suit/storage/toggle/det_trench/black, +/obj/item/clothing/suit/storage/toggle/trench/det_trench/black, /obj/effect/decal/remains, /turf/simulated/floor/plating, /area/maintenance/security_interstitial)