From dbf43864d7e5717cf31e2217ed7884e609b09f1c Mon Sep 17 00:00:00 2001 From: sarcoph <83266791+sarcoph@users.noreply.github.com> Date: Thu, 28 Apr 2022 12:49:28 -0800 Subject: [PATCH] fix: cards drawn from hand can merge into original deck small oversight --- hyperstation/code/game/objects/items/cards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperstation/code/game/objects/items/cards.dm b/hyperstation/code/game/objects/items/cards.dm index 9cfba0109..a2c0c1e1b 100644 --- a/hyperstation/code/game/objects/items/cards.dm +++ b/hyperstation/code/game/objects/items/cards.dm @@ -294,7 +294,7 @@ S.card = _card S.rotation = _card["rotation"] S.face_up = _card["face_up"] - S.parentdeck = src + S.parentdeck = src.parentdeck S.apply_card_vars(S,src) currenthand -= list(_card) S.update_icon()