From 2e0d3dbf2986d829474200251baffc9e57366e4a Mon Sep 17 00:00:00 2001 From: Toastical <20125180+Toastical@users.noreply.github.com> Date: Wed, 14 May 2025 01:26:27 +0300 Subject: [PATCH] replace abstract flag with skip_examine trait (#29276) --- code/datums/elements/strippable.dm | 2 +- code/game/objects/items/weapons/knuckledusters.dm | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index d0283e3897a..d205029ad20 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -325,7 +325,7 @@ var/list/result var/obj/item/item = item_data.get_item(owner) - if(item && (item.flags & ABSTRACT || HAS_TRAIT(item, TRAIT_NO_STRIP) || HAS_TRAIT(item, TRAIT_SKIP_EXAMINE))) + if(item && (item.flags & ABSTRACT || HAS_TRAIT(item, TRAIT_NO_STRIP))) items[strippable_key] = result continue diff --git a/code/game/objects/items/weapons/knuckledusters.dm b/code/game/objects/items/weapons/knuckledusters.dm index 51a5b5ca697..7d2d6d57ed1 100644 --- a/code/game/objects/items/weapons/knuckledusters.dm +++ b/code/game/objects/items/weapons/knuckledusters.dm @@ -23,16 +23,19 @@ if(!gripped) gripped = TRUE to_chat(user, "You tighten your grip on [src], ensuring you won't drop it.") - flags |= (NODROP | ABSTRACT) + flags |= NODROP + ADD_TRAIT(src, TRAIT_SKIP_EXAMINE, "knuckledusters") else gripped = FALSE to_chat(user, "You relax your grip on [src].") - flags &= ~(NODROP | ABSTRACT) + flags &= ~NODROP + REMOVE_TRAIT(src, TRAIT_SKIP_EXAMINE, "knuckledusters") /obj/item/melee/knuckleduster/dropped(mob/user, silent) . = ..() gripped = FALSE - flags &= ~(NODROP | ABSTRACT) + flags &= ~NODROP + REMOVE_TRAIT(src, TRAIT_SKIP_EXAMINE, "knuckledusters") /obj/item/melee/knuckleduster/attack__legacy__attackchain(mob/living/target, mob/living/user) . = ..()