From d5944df1232cd265efdb92901745637360efdcf8 Mon Sep 17 00:00:00 2001 From: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com> Date: Fri, 14 Jun 2024 19:24:52 +0100 Subject: [PATCH] Fixes thermal holster trait issues (#83962) ## About The Pull Request Uses ADD_CLOTHING_TRAIT to store a ref to the individual holster item that's providing the gunflip trait. This fixes an issue that was happening where having one holster equipped and dropping or unequipping another would remove the trait from you, even though you were still wearing one. ## Why It's Good For The Game Fixes #83762 ## Changelog :cl: fix: Fixed thermal pistols sometimes not recognising an equipped holster when trying to spin them to recharge. /:cl: --- code/game/objects/items/storage/holsters.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 400c949a993..afb7b0f750b 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -11,11 +11,11 @@ /obj/item/storage/belt/holster/equipped(mob/user, slot) . = ..() if(slot & (ITEM_SLOT_BELT|ITEM_SLOT_SUITSTORE)) - ADD_TRAIT(user, TRAIT_GUNFLIP, CLOTHING_TRAIT) + ADD_CLOTHING_TRAIT(user, TRAIT_GUNFLIP) /obj/item/storage/belt/holster/dropped(mob/user) . = ..() - REMOVE_TRAIT(user, TRAIT_GUNFLIP, CLOTHING_TRAIT) + REMOVE_CLOTHING_TRAIT(user, TRAIT_GUNFLIP) /obj/item/storage/belt/holster/Initialize(mapload) . = ..()