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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	code/game/objects/items/devices/uplink.dm
This commit is contained in:
Zuhayr
2015-09-07 11:17:06 +09:30
parent 9d5f14298d 9533f2d154
commit b9c01bf2f2
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed_storage.dm
+1 -1
View File
@@ -101,7 +101,7 @@
if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS))
if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) < 0.05)
dat += "<td>Low</td>"
else if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS) > 0.2)
else if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) > 0.2)
dat += "<td>High</td>"
else
dat += "<td>Norm</td>"