cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-08-28 18:33:36 -04:00
committed by GitHub
parent f64d19b948
commit d8b6de1db0
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/client/stored_item.dm
View File

@@ -250,10 +250,7 @@
persist_storable = FALSE persist_storable = FALSE
/obj/item/weapon/rcd /obj/item/weapon/rcd
persist_storable = FALSE persist_storable = FALSE
<<<<<<< HEAD
=======
/obj/item/weapon/spacecash /obj/item/weapon/spacecash
persist_storable = FALSE persist_storable = FALSE
/obj/item/weapon/spacecasinocash /obj/item/weapon/spacecasinocash
persist_storable = FALSE persist_storable = FALSE
>>>>>>> e5ae85f667... Merge pull request #13536 from Heroman3003/casino-changes