From 39f9fbec1f4aae83e48b48f5349961f09bc45362 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 25 May 2018 13:24:00 -0400 Subject: [PATCH] Accessory Fixes - Only holsters with utility slot can be unsheathed/sheathed by clicking on the suit (to stop conflicts with webbing) - Heavy Armor Plates no longer have a bugged/invisible icon --- code/modules/clothing/under/accessories/armor.dm | 2 +- code/modules/clothing/under/accessories/holster.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index df9e3b7c173..c6abaa60158 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -89,7 +89,7 @@ /obj/item/clothing/accessory/armor/armorplate/merc name = "heavy armor plate" desc = "A ceramics-reinforced synthetic armor plate, providing state of of the art protection. Attaches to a plate carrier." - icon_state = "armor_heavy" + icon_state = "armor_merc" armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) ////////////// diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index cc3253db0fe..f9a2e53f311 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -52,7 +52,7 @@ clear_holster() /obj/item/clothing/accessory/holster/attack_hand(mob/user as mob) - if (has_suit) //if we are part of a suit + if (has_suit && (slot & ACCESSORY_SLOT_UTILITY)) //if we are part of a suit if (holstered) unholster(user) return