From 29e53d1cc3510c6d90352c970118d1e0481b7918 Mon Sep 17 00:00:00 2001
From: sarcoph <83266791+sarcoph@users.noreply.github.com>
Date: Mon, 25 Apr 2022 23:17:31 -0800
Subject: [PATCH] fix failed merge bug

if you merged cards but they were incompatible decks it would delete the cards. this stops it from doing that
---
 hyperstation/code/game/objects/items/cards.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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, "<span class='warning'>\The [src] is stuck to your hand, you can't add it to \the [target]!</span>")
-		return TRUE
 	if(target.parentdeck != src && src.parentdeck != target && src.parentdeck != target.parentdeck)
 		to_chat(user, "<span class='warning'>You can't mix cards from other decks!</span>")
 		return TRUE
+	if(!user.temporarilyRemoveItemFromInventory(src))
+		to_chat(user, "<span class='warning'>\The [src] is stuck to your hand, you can't add it to \the [target]!</span>")
+		return TRUE
 	return FALSE
 	// unimplemented