cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 19:53:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update protean_powers.dm

Browse Source
This commit is contained in:
Nadyr
2021-04-11 06:40:59 -04:00
committed by GitHub
parent 6e96cc13f9
commit e9b7cd62ec
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
-6
View File
@@ -296,12 +296,6 @@
var/obj/item/stack/material/matstack = held
var/substance = matstack.material.name
<<<<<<< HEAD
var/list/edible_materials = list(MAT_STEEL) //Can't eat all materials, just useful ones. CHOMP EDIT: Only steel
||||||| parent of 516416c027... Merge pull request #10097 from Meghan-Rossi/proteanfix
var/list/edible_materials = list(MAT_STEEL, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_METALHYDROGEN) //Can't eat all materials, just useful ones.
=======
>>>>>>> 516416c027... Merge pull request #10097 from Meghan-Rossi/proteanfix
var allowed = FALSE
for(var/material in PROTEAN_EDIBLE_MATERIALS)
if(material == substance) allowed = TRUE