From 62c04f34d1d71114f4b768a7ce4b82ad0b3f99de Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 22 May 2022 18:10:30 -0400 Subject: [PATCH] Ports card icons from Eris. Implements them for VOREStation --- .../loadout/loadout_general_vr.dm | 12 ++++- code/modules/games/egy_cards_vr.dm | 47 ++++++++++++++++++ icons/obj/playing_cards.dmi | Bin 4118 -> 5738 bytes vorestation.dme | 1 + 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 code/modules/games/egy_cards_vr.dm diff --git a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm index e2f863dae5..00957a2fea 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm @@ -94,5 +94,15 @@ /datum/gear/schnapsen display_name = "schnapsen playing cards" +<<<<<<< HEAD description = "French-suit playing cards! Pre-picked for 2-player mode." - path = /obj/item/weapon/deck/schnapsen \ No newline at end of file + path = /obj/item/weapon/deck/schnapsen +======= + description = "An ancient Austro-Hungarian suit of cards!" + path = /obj/item/weapon/deck/schnapsen + +/datum/gear/egy_game + display_name = "EGY playing cards" + description = "A deck of cards for playing EGY! Be the first to lose all cards!" + path = /obj/item/weapon/deck/egy +>>>>>>> 421d3113d2... Merge pull request #12996 from Runa-Dacino/uno_eris diff --git a/code/modules/games/egy_cards_vr.dm b/code/modules/games/egy_cards_vr.dm new file mode 100644 index 0000000000..c41fd68b19 --- /dev/null +++ b/code/modules/games/egy_cards_vr.dm @@ -0,0 +1,47 @@ +//Sprites ported from Eris + +/obj/item/weapon/deck/egy + name = "deck of EGY playing cards" + desc = "A simple deck of EGY playing cards. Be the first to lose all cards, but forget not to declare: EGY on your second to last trick." + icon_state = "deck3" + + + + +/obj/item/weapon/deck/egy/New() + ..() + var/datum/playingcard/P + //Universal cards + for(var/i=0; i<=3; i++) + P = new() + P.name = "\improper Wild +4" + P.card_icon = "+4" + P.back_icon = "deck1" + cards += P + for(var/i=0; i<=3; i++) + P = new() + P.name = "\improper Wildcard" + P.card_icon = "colorswap" + P.back_icon = "deck1" + cards += P + //Colour cards + for(var/colour in list("red", "yellow", "blue", "green")) + //Specials + for(var/special in list("reverse","+2","skip")) + //2 of each + for(var/i=0; i<=1; i++) + P = new() + P.name = "\improper [colour] [special]" + P.card_icon = "[colour]_[special]" + P.back_icon = "deck1" + cards += P + //Number cards + for(var/number in list("0","1","2","3","4","5","6","7","8","9")) + //2 of each for 0-9, using 2 of "0" per Crow's request + for(var/i=0; i<=1; i++) + P = new() + P.name = "\improper [colour] [number]" + P.card_icon = "[colour]_[number]" + P.back_icon = "deck1" + cards += P + diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 071d53b04b6109f118039b5c0a1ea910e8e3eb7a..0f2e51923a79205e7a1c29cefe4b17c3819c0bbf 100644 GIT binary patch literal 5738 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 literal 4118 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 diff --git a/vorestation.dme b/vorestation.dme index ed039c32d2..ae69ed5255 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2519,6 +2519,7 @@ #include "code\modules\games\cards.dm" #include "code\modules\games\cards_ch.dm" #include "code\modules\games\dice.dm" +#include "code\modules\games\egy_cards_vr.dm" #include "code\modules\games\schnapsen_vr.dm" #include "code\modules\games\spaceball_cards.dm" #include "code\modules\games\tarot.dm"