From c2200cd1dadb804625c19b09c928d0db3fef18bb Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 20 Aug 2019 16:24:46 -0700 Subject: [PATCH] Cleans up card generation a little (#45784) Just condensing some code down, nothing really to note. --- code/game/objects/items/toys.dm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 09e99780868..8ecdddaf79c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -678,29 +678,15 @@ . = ..() populate_deck() +///Generates all the cards within the deck. /obj/item/toy/cards/deck/proc/populate_deck() icon_state = "deck_[deckstyle]_full" - for(var/i in 2 to 10) - cards += "[i] of Hearts" - cards += "[i] of Spades" - cards += "[i] of Clubs" - cards += "[i] of Diamonds" - cards += "King of Hearts" - cards += "King of Spades" - cards += "King of Clubs" - cards += "King of Diamonds" - cards += "Queen of Hearts" - cards += "Queen of Spades" - cards += "Queen of Clubs" - cards += "Queen of Diamonds" - cards += "Jack of Hearts" - cards += "Jack of Spades" - cards += "Jack of Clubs" - cards += "Jack of Diamonds" - cards += "Ace of Hearts" - cards += "Ace of Spades" - cards += "Ace of Clubs" - cards += "Ace of Diamonds" + for(var/suit in list("Hearts", "Spades", "Clubs", "Diamonds")) + cards += "Ace of [suit]" + for(var/i in 2 to 10) + cards += "[i] of [suit]" + for(var/person in list("Jack", "Queen", "King")) + cards += "[person] of [suit]" //ATTACK HAND IGNORING PARENT RETURN VALUE //ATTACK HAND NOT CALLING PARENT