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

Merge pull request #4549 from CHOMPStation2/upstream-merge-13319

Browse Source 
[MIRROR] Adds roulette balls
This commit is contained in:
Nadyr
2022-07-19 20:55:00 -04:00
committed by GitHub
parent 78747ce871 89f75534f9
commit 259d1fd47d
10 changed files with 335 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_helpers/global_lists_vr.dm
View File

@@ -256,7 +256,8 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/weapon/folder,
/obj/item/weapon/clipboard,
/obj/item/weapon/coin,
/obj/item/clothing/ears //chompstation addition end
/obj/item/clothing/ears, //chompstation addition end
//CHOMPedit: disabled because this is in a file we don't use /obj/item/roulette_ball
)
var/global/list/contamination_flavors = list(
@@ -844,4 +845,4 @@ var/global/list/xenobio_rainbow_extracts = list(
/obj/item/slime_extract/ruby = 3,
/obj/item/slime_extract/emerald = 3,
/obj/item/slime_extract/light_pink = 1,
/obj/item/slime_extract/rainbow = 1)
/obj/item/slime_extract/rainbow = 1)