From 05c0a668e738c97d797ccfc2d7fad4e7adb550ff Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Fri, 20 May 2022 15:44:04 +0200 Subject: [PATCH] Adds Uno playing cards Ports sprites from eris into playing_cards.dmi. Adjusts vorestation.dme to include uno_vr.dm Adds uno_vr.dm to create uno playing card hand and deck. --- code/modules/games/uno_vr.dm | 47 +++++++++++++++++++++++++++++++++++ icons/obj/playing_cards.dmi | Bin 4118 -> 5738 bytes vorestation.dme | 3 ++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 code/modules/games/uno_vr.dm diff --git a/code/modules/games/uno_vr.dm b/code/modules/games/uno_vr.dm new file mode 100644 index 0000000000..b304c7a1b8 --- /dev/null +++ b/code/modules/games/uno_vr.dm @@ -0,0 +1,47 @@ +//Sprites ported from Eris + +/obj/item/weapon/deck/uno + name = "deck of Uno playing cards" + desc = "A simple deck of uno playing cards." + icon_state = "deck3" + + + + +/obj/item/weapon/deck/uno/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..450e961ed6c6777eb51f95b66694feae7b633dcc 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 40d0515ef9..2b7afceeaf 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2366,6 +2366,7 @@ #include "code\modules\games\schnapsen_vr.dm" #include "code\modules\games\spaceball_cards.dm" #include "code\modules\games\tarot.dm" +#include "code\modules\games\uno_vr.dm" #include "code\modules\games\wizoff.dm" #include "code\modules\genetics\side_effects.dm" #include "code\modules\ghosttrap\trap.dm" @@ -4125,6 +4126,7 @@ #include "maps\expedition_vr\beach\submaps\mountains.dm" #include "maps\expedition_vr\beach\submaps\mountains_areas.dm" #include "maps\gateway_archive_vr\blackmarketpackers.dm" +#include "maps\groundbase\groundbase.dm" #include "maps\offmap_vr\om_ships\abductor.dm" #include "maps\southern_cross\items\clothing\sc_accessory.dm" #include "maps\southern_cross\items\clothing\sc_suit.dm" @@ -4132,7 +4134,6 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellardelight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm"