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 d021e237cd7..2d906ee0a26 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm @@ -97,7 +97,7 @@ description = "French-suit playing cards! Pre-picked for 2-player mode." path = /obj/item/weapon/deck/schnapsen -/datum/gear/uno_game - display_name = "UNO playing cards" - description = "A deck of cards for playing UNO!" - path = /obj/item/weapon/deck/uno +/datum/gear/egy_game + display_name = "EGY playing cards" + description = "A deck of cards for playing EGY! Be the firs tto lose all cards!" + path = /obj/item/weapon/deck/egy diff --git a/code/modules/games/uno_vr.dm b/code/modules/games/egy_cards_vr.dm similarity index 80% rename from code/modules/games/uno_vr.dm rename to code/modules/games/egy_cards_vr.dm index b304c7a1b82..c41fd68b19d 100644 --- a/code/modules/games/uno_vr.dm +++ b/code/modules/games/egy_cards_vr.dm @@ -1,14 +1,14 @@ //Sprites ported from Eris -/obj/item/weapon/deck/uno - name = "deck of Uno playing cards" - desc = "A simple deck of uno playing cards." +/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/uno/New() +/obj/item/weapon/deck/egy/New() ..() var/datum/playingcard/P //Universal cards diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 450e961ed6c..0f2e51923a7 100644 Binary files a/icons/obj/playing_cards.dmi and b/icons/obj/playing_cards.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 2b7afceeaf7..3b3aad71905 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2363,10 +2363,10 @@ #include "code\modules\games\cardemon.dm" #include "code\modules\games\cards.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" -#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" @@ -4126,7 +4126,6 @@ #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" @@ -4143,5 +4142,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" +#include "maps\tether\tether.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE