Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting

# Conflicts:
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-26 22:58:56 +02:00
222 changed files with 1040 additions and 866 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
A.nullifyPipenet(src)
return ..()
/datum/pipeline/proc/process()//This use to be called called from the pipe networks
/datum/pipeline/process()//This use to be called called from the pipe networks
if(update)
update = 0
reconcile_air()