cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-14 09:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-12767

Browse Source
This commit is contained in:
Nadyr
2022-04-17 23:33:35 -04:00
committed by GitHub
parent c9eb919583 db0ddb1cd6
commit d45c7b7eed
58 changed files with 1247 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_general_vr.dm
+2 -6
View File
@@ -90,13 +90,9 @@
/datum/gear/textmug
display_name = "mug with text"
description = "A mug with something written on it."
<<<<<<< HEAD
path = /obj/item/weapon/reagent_containers/food/drinks/textmug
=======
path = /obj/item/weapon/reagent_containers/food/drinks/textmug
/datum/gear/schnapsen
display_name = "schnapsen playing cards"
description = "French-suit playing cards! Pre-picked for 2-player mode."
path = /obj/item/weapon/deck/schnapsen
>>>>>>> b042467fe4... Merge pull request #12767 from GhostActual/powder_drugs
path = /obj/item/weapon/deck/schnapsen