From f98cc4a2f99bf48948619200629367260d9f2d2d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 20 Aug 2022 08:37:42 +0200 Subject: [PATCH] [MIRROR] Fix haunted tarot deck exploit [MDB IGNORE] (#15715) * Fix haunted tarot deck exploit (#69234) * Fix haunted tarot deck exploit Co-authored-by: Tim --- code/modules/cards/deck/tarot.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/cards/deck/tarot.dm b/code/modules/cards/deck/tarot.dm index eb56c320cf6..03969f9ce36 100644 --- a/code/modules/cards/deck/tarot.dm +++ b/code/modules/cards/deck/tarot.dm @@ -56,4 +56,10 @@ REMOVE_TRAIT(user, TRAIT_SIXTHSENSE, MAGIC_TRAIT) to_chat(user, span_notice("The veil to the underworld closes shut. You feel your senses returning to normal.")) +/obj/item/toy/cards/deck/tarot/haunted/dropped(mob/living/carbon/user, silent) + . = ..() + if(wielded) + REMOVE_TRAIT(user, TRAIT_SIXTHSENSE, MAGIC_TRAIT) + to_chat(user, span_notice("The veil to the underworld closes shut. You feel your senses returning to normal.")) + #undef TAROT_GHOST_TIMER