diff --git a/hyperstation/code/game/objects/items/cards.dm b/hyperstation/code/game/objects/items/cards.dm index 663a41a33..9cfba0109 100644 --- a/hyperstation/code/game/objects/items/cards.dm +++ b/hyperstation/code/game/objects/items/cards.dm @@ -58,12 +58,12 @@ * was actually attempted. */ /obj/item/toy/cards/proc/MergeInto(obj/item/toy/cards/target, mob/living/user) - if(!user.temporarilyRemoveItemFromInventory(src)) - to_chat(user, "\The [src] is stuck to your hand, you can't add it to \the [target]!") - return TRUE if(target.parentdeck != src && src.parentdeck != target && src.parentdeck != target.parentdeck) to_chat(user, "You can't mix cards from other decks!") return TRUE + if(!user.temporarilyRemoveItemFromInventory(src)) + to_chat(user, "\The [src] is stuck to your hand, you can't add it to \the [target]!") + return TRUE return FALSE // unimplemented