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

Update global_lists_vr.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-28 00:27:49 -04:00
committed by GitHub
parent 8db3a020a0
commit 4a8c021ea4
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/_helpers/global_lists_vr.dm
View File

@@ -223,16 +223,10 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/weapon/storage/fancy/crayons,
/obj/item/weapon/storage/fancy/egg_box,
/obj/item/weapon/storage/wallet,
<<<<<<< HEAD
/obj/item/weapon/storage/vore_egg,
/obj/item/weapon/material/kitchen) //chompstation addition
||||||| parent of 2664382e67... Merge pull request #9976 from H0lySquirr3l/master
/obj/item/weapon/storage/vore_egg)
=======
/obj/item/weapon/storage/vore_egg,
/obj/item/weapon/material/kitchen, //chompstation addition
/obj/item/weapon/bikehorn/tinytether
)
>>>>>>> 2664382e67... Merge pull request #9976 from H0lySquirr3l/master
var/global/list/contamination_flavors = list(
"Generic" = contamination_flavors_generic,