From fa8f844ce5b6806ca5f31a749899f8afd24ec28e Mon Sep 17 00:00:00 2001 From: Alberyk Date: Tue, 31 Dec 2019 08:13:03 -0300 Subject: [PATCH] Fixes the brown holster selection on the loadout not working properly (#7864) --- .../preference_setup/loadout/loadout_accessories.dm | 8 ++++---- code/modules/clothing/under/accessories/holster.dm | 2 +- html/changelogs/alberyk-holster.yml | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/alberyk-holster.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 0b78afff716..404f26bd28a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -50,10 +50,10 @@ holsters["black holster, hip"] = /obj/item/clothing/accessory/holster/hip holsters["black holster, waist"] = /obj/item/clothing/accessory/holster/waist holsters["black holster, thigh"] = /obj/item/clothing/accessory/holster/thigh - holsters["brown holster, armpit"] = /obj/item/clothing/accessory/holster/armpit - holsters["brown holster, hip"] = /obj/item/clothing/accessory/holster/hip - holsters["brown holster, waist"] = /obj/item/clothing/accessory/holster/waist - holsters["brown holster, thigh"] = /obj/item/clothing/accessory/holster/thigh + holsters["brown holster, armpit"] = /obj/item/clothing/accessory/holster/armpit/brown + holsters["brown holster, hip"] = /obj/item/clothing/accessory/holster/hip/brown + holsters["brown holster, waist"] = /obj/item/clothing/accessory/holster/waist/brown + holsters["brown holster, thigh"] = /obj/item/clothing/accessory/holster/thigh/brown gear_tweaks += new/datum/gear_tweak/path(holsters) /datum/gear/accessory/tie diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 330dbc432a2..352cfe6288d 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -159,7 +159,7 @@ name = "brown hip holster" icon_state = "holster__brown_hip" -/obj/item/clothing/accessory/holster/thigh +/obj/item/clothing/accessory/holster/thigh/brown name = "brown thigh holster" icon_state = "holster_brown_thigh" diff --git a/html/changelogs/alberyk-holster.yml b/html/changelogs/alberyk-holster.yml new file mode 100644 index 00000000000..e0b9b55e02b --- /dev/null +++ b/html/changelogs/alberyk-holster.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the brown holster selection on the loadout not working."