shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

Browse Source
This commit is contained in:
Artur
2020-07-13 16:20:54 +03:00
parent d1b3990875 fbbb5f7ea8
commit 5f9364c5f8
177 changed files with 3628 additions and 2948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/misc.dm
+2 -2
View File
@@ -57,8 +57,8 @@
return
var/datum/gas_mixture/stank = new
stank.gases[/datum/gas/miasma] = (yield + 6)*7*0.02 // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses
stank.temperature = T20C // without this the room would eventually freeze and miasma mining would be easier
stank.adjust_moles(/datum/gas/miasma,(yield + 6)*7*0.02) // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses
stank.set_temperature(T20C) // without this the room would eventually freeze and miasma mining would be easier
T.assume_air(stank)
T.air_update_turf()
code/modules/hydroponics/grown/towercap.dm
+2 -2
View File
@@ -226,8 +226,8 @@
if(isopenturf(loc))
var/turf/open/O = loc
if(O.air)
var/loc_gases = O.air.gases
if(loc_gases[/datum/gas/oxygen] > 13)
var/datum/gas_mixture/loc_air = O.air
if(loc_air.get_moles(/datum/gas/oxygen) > 13)
return TRUE
return FALSE