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

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
This commit is contained in:
PsiOmegaDelta
2015-12-06 11:34:36 +01:00
parent 6997361c3c 52e8f71c7f
commit 6a22086c17
25 changed files with 165 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/datum_pipeline.dm
-3
View File
@@ -28,9 +28,6 @@ datum/pipeline
if(!member.check_pressure(pressure))
break //Only delete 1 pipe per process
//Allow for reactions
//air.react() //Should be handled by pipe_network now
proc/temporarily_store_air()
//Update individual gas_mixtures by volume ratio