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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-02-19 20:31:40 -05:00
committed by GitHub
parent aba4c656ea
commit 4f53ebd9c9
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/reagents/other.dm
View File

@@ -638,7 +638,7 @@
taste_description = "slimy dirt"
reagent_state = LIQUID
color = "#62764E"
<<<<<<< HEAD
nutriment_factor = 15
//YW Edit Start
/datum/reagent/nutriment/paper //Paper is made from cellulose. You can eat it. It doesn't fill you up very much at all.
@@ -650,6 +650,3 @@
color = "e6e6e6" //not quite white
nutriment_factor = 2 // 5 times worse than nutriment
//YW Edit End
=======
nutriment_factor = 15
>>>>>>> 3b23b6a4969... Merge pull request #12286 from Heroman3003/branch