From 72ffa5b794b1b98ebef164aaa8fb18f2637b4f26 Mon Sep 17 00:00:00 2001 From: Warfan1815 <69102610+Warfan1815@users.noreply.github.com> Date: Tue, 27 Feb 2024 16:54:06 +0000 Subject: [PATCH] Fixes Trading Card Descriptions (#5812) # About the pull request Because I'm an idiot I messed up the order of the green and red cards (so they are inverted) I also am deciding to invert the order of the blue cards (as it makes more sense for the ICSC logo to be the rarest) # Explain why it's good for the game Would be good for the descriptors to be accurate # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: spellcheck: Fixed the order of trading cards (as they were accidentally inverted) /:cl: --- code/game/objects/items/toys/trading_cards.dm | 8 ++++---- icons/obj/items/playing_cards.dmi | Bin 6978 -> 6981 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 23a35abec45e..9fb83cd1e5e1 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -14,11 +14,11 @@ var/front_description = "A red trading card with a picture of the United Americas flag emblazoned on it. It is number one out of the five red cards." var/back_icon_state = "trading_red" var/front_icon_state = "trading_red_one" - var/picture_descriptions = list("5" = list("red" = "a Holy Order of the HEFA cultist", "green" = "General Delyla S. Vaughn (the Assistant Commandant of the United States Colonial Marines)", "blue" = "the Weyland Yutani logo"), - "4" = list("red" = "a UPPA officer", "green" = "General Diego Dellamarggio (the Commandant of the United States Colonial Marines)", "blue" = "the Independent Core System Colonies logo"), + var/picture_descriptions = list("5" = list("red" = "a fanatical colonial seditionist", "green" = "Almirante Joelle De La Cruz (the United Americas Secretary of Defense)", "blue" = "the United Americas flag"), + "4" = list("red" = "a UPPA soldier", "green" = "Marechal-do-ar Enzo Gabriel Lurdes (the Chief of Naval Operations of the Latin American Colonial Navy)", "blue" = "the Union of Progressive Peoples flag"), "3" = list("red" = "a UPPA minigunner", "green" = "Generale d'armee Felix Couture (the Commandant of the Canadian Colonial Armed Forces)", "blue" = "the Three World Empire flag"), - "2" = list("red" = "a UPPA soldier", "green" = "Marechal-do-ar Enzo Gabriel Lurdes (the Chief of Naval Operations of the Latin American Colonial Navy)", "blue" = "the Union of Progressive Peoples flag"), - "1" = list("red" = "a fanatical colonial seditionist", "green" = "Almirante Joelle De La Cruz (the United Americas Secretary of Defense)", "blue" = "the United Americas flag",) + "2" = list("red" = "a UPPA officer", "green" = "General Diego Dellamarggio (the Commandant of the United States Colonial Marines)", "blue" = "the Weyland Yutani logo"), + "1" = list("red" = "a Holy Order of the HEFA cultist", "green" = "General Delyla S. Vaughn (the Assistant Commandant of the United States Colonial Marines)", "blue" = "the Independent Core System Colonies logo",) ) /obj/item/toy/trading_card/Initialize() diff --git a/icons/obj/items/playing_cards.dmi b/icons/obj/items/playing_cards.dmi index e69286371ae0f554f2e08fd9f0ed198497a2da05..61b521edddd80982fdacb82f22f473efaf3204cc 100644 GIT binary patch delta 5749 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 e{{?b)lsQ_|eLsz019#QvV0GpAJm` delta 5670 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