cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-05 13:11:46 -05:00
committed by GitHub
parent 1dc06fd9e6
commit dce81c41e8
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_helpers/global_lists_vr.dm
View File

@@ -231,7 +231,7 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/weapon/storage/wallet, /obj/item/weapon/storage/wallet,
/obj/item/weapon/storage/vore_egg, /obj/item/weapon/storage/vore_egg,
/obj/item/weapon/bikehorn/tinytether, /obj/item/weapon/bikehorn/tinytether,
<<<<<<< HEAD /obj/item/capture_crystal,
/obj/item/weapon/material/kitchen, //chompstation addition start /obj/item/weapon/material/kitchen, //chompstation addition start
/obj/item/weapon/storage/mre, /obj/item/weapon/storage/mre,
/obj/item/weapon/storage/mrebag, /obj/item/weapon/storage/mrebag,
@@ -255,9 +255,6 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/weapon/clipboard, /obj/item/weapon/clipboard,
/obj/item/weapon/coin, /obj/item/weapon/coin,
/obj/item/clothing/ears //chompstation addition end /obj/item/clothing/ears //chompstation addition end
=======
/obj/item/capture_crystal
>>>>>>> 60011ecd0b... Merge pull request #11928 from Very-Soft/whalesandcrystals
) )
var/global/list/contamination_flavors = list( var/global/list/contamination_flavors = list(