From 2f2687f43f404a6e2d63e33f56816f2fd5b17f6f Mon Sep 17 00:00:00 2001 From: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com> Date: Mon, 10 Apr 2023 00:04:53 +0100 Subject: [PATCH] Fixes TGC decks being capped to 31 cards rather than 30. (#74602) ## About The Pull Request Fixes #72701 (closed but the issue seems to have been misunderstood.) TGC decks are limited to 30 cards when inserting cards by using the deck on individual cards (the legal amount) but using individual cards on a deck has a limit of 31 cards instead, the 30 card limit is now correctly checked on card insertions. ## Why It's Good For The Game Bugfix. ## Changelog :cl: fix: TGC decks will no longer allow you to insert an illegal 31st card. /:cl: --- code/game/objects/items/tcg/tcg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index 3c1a42e1169..451d6dfcec1 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) /obj/item/tcgcard_deck/attackby(obj/item/item, mob/living/user, params) . = ..() if(istype(item, /obj/item/tcgcard)) - if(contents.len > 30) + if(contents.len >= 30) to_chat(user, span_notice("This pile has too many cards for a regular deck!")) return FALSE var/obj/item/tcgcard/new_card = item