diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 8b8e967dc89..69e557e1992 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -215,11 +215,13 @@ user.show_message("The DNA hash on the card is [dna_hash].",1) user.show_message("The fingerprint hash on the card is [fingerprint_hash].",1) -/obj/item/weapon/card/id/attack_self(mob/user as mob) - user.visible_message("[user] shows you: [bicon(src)] [src.name]: assignment: [src.assignment]",\ - "You flash your ID card: [bicon(src)] [src.name]: assignment: [src.assignment]") - src.add_fingerprint(user) - return +/obj/item/weapon/card/id/attack_self(var/mob/user) + if(user.attack_delayer.blocked()) + return + user.visible_message("[user] shows you: [bicon(src)] [name]: assignment: [assignment]",\ + "You flash your ID card: [bicon(src)] [name]: assignment: [assignment]") + user.delayNextAttack(1 SECONDS) + add_fingerprint(user) /obj/item/weapon/card/id/GetAccess() return (access | base_access) diff --git a/code/modules/games/cards/playing_cards.dm b/code/modules/games/cards/playing_cards.dm index 99f3ba9f431..fa5da5016ac 100644 --- a/code/modules/games/cards/playing_cards.dm +++ b/code/modules/games/cards/playing_cards.dm @@ -92,11 +92,14 @@ update_icon() -/obj/item/toy/cards/attack_self(mob/user as mob) +/obj/item/toy/cards/attack_self(var/mob/user) + if(user.attack_delayer.blocked()) + return cards = shuffle(cards) playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) user.visible_message("[user] shuffles the deck.", "You shuffle the deck.") + user.delayNextAttack(1 SECONDS) /obj/item/toy/cards/attackby(obj/item/I, mob/living/user) ..()