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 071d53b04b..0f2e51923a 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 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"