cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports card icons from Eris. Implements them for VOREStation

Browse Source
This commit is contained in:
Casey
2022-05-22 22:11:13 +00:00
committed by CHOMPStation2
parent 7e9b5e592f
commit 62c04f34d1
4 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_general_vr.dm
+11 -1
View File
@@ -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
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