cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Chemistry-Reagents-Food-Drinks.dm

Browse Source
This commit is contained in:
Novacat
2021-04-10 09:54:48 -04:00
committed by GitHub
parent 801fde168b
commit 3a9791f0c9
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
-3
View File
@@ -4156,8 +4156,6 @@
reagent_state = LIQUID
nutriment_factor = 40 //very filling
color = "#d169b2"
<<<<<<< HEAD
=======
//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021
@@ -4183,4 +4181,3 @@
nutriment_factor = 2
glass_name = "kvass"
glass_desc = "A hearty glass of Slavic brew."
>>>>>>> a0ff9a0... Boda Tweaks and Russian Drinks V2 (#8023)