cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 23:16:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'polaris/master' into polaris-sync

Browse Source 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
This commit is contained in:
Leshana
2017-04-15 23:14:32 -05:00
parent a6d1047f48 1fbef2de5b
commit 7a4dc4bf79
108 changed files with 3048 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed.dm
+1 -5
View File
@@ -296,11 +296,7 @@
// Handle light requirements.
if(!light_supplied)
var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in current_turf
if(L)
light_supplied = max(0,min(10,L.lum_r + L.lum_g + L.lum_b)-5)
else
light_supplied = 5
light_supplied = current_turf.get_lumcount() * 5
if(light_supplied)
if(abs(light_supplied - get_trait(TRAIT_IDEAL_LIGHT)) > get_trait(TRAIT_LIGHT_TOLERANCE))
health_change += rand(1,3) * HYDRO_SPEED_MULTIPLIER
code/modules/hydroponics/spreading/spreading.dm
+1 -1
View File
@@ -192,7 +192,7 @@
if(growth>2 && growth == max_growth)
layer = 5
opacity = 1
set_opacity(1)
if(!isnull(seed.chems["woodpulp"]))
density = 1
else
code/modules/hydroponics/trays/tray.dm
+1 -6
View File
@@ -625,12 +625,7 @@
if(closed_system && mechanical)
light_string = "that the internal lights are set to [tray_light] lumens"
else
var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
var/light_available
if(L)
light_available = max(0,min(10,L.lum_r + L.lum_g + L.lum_b)-5)
else
light_available = 5
var/light_available = T.get_lumcount() * 5
light_string = "a light level of [light_available] lumens"
usr << "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K at [environment.return_pressure()] kPa in the [environment_type] environment"