cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 22:28:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-05-27 15:51:56 -04:00
committed by GitHub
parent 3246c587a8
commit c75225ef09
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_general_vr.dm
-5
View File
@@ -94,10 +94,5 @@
/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
=======
description = "An ancient Austro-Hungarian suit of cards!"
path = /obj/item/weapon/deck/schnapsen
>>>>>>> ce50127b0a... Merge pull request #12997 from Runa-Dacino/schnapsen_fix