Merge branch 'master' into master

2017-03-18 12:05:51 +02:00
parent 81956b0502 3f29a01970
commit 00b7dce512
4 changed files with 1 additions and 2 deletions
@@ -220,7 +220,6 @@ var/datum/subsystem/air/SSair
 		currentrun.len--
 		if (isturf(T))
 			T.process_cell(fire_count)
-
 		if (MC_TICK_CHECK)
 			return

@@ -186,4 +186,4 @@ var/datum/subsystem/processing/overlays/SSoverlays
 	overlays -= x

 /image/proc/cut_overlays(x)
-	overlays.Cut()
+	overlays.Cut()