From 3246c587a88fbd3bc4623d50171c723b1c60c1db Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 22 May 2022 14:22:25 -0400 Subject: [PATCH] Changes Schnapsen loadout description --- .../client/preference_setup/loadout/loadout_general_vr.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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..4f241c4b6f 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,10 @@ /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 +>>>>>>> ce50127b0a... Merge pull request #12997 from Runa-Dacino/schnapsen_fix