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

Merge branch 'master' into revert-284-revert-281-master

Browse Source
This commit is contained in:
Verkister
2017-03-16 23:57:37 +02:00
committed by GitHub
parent 545dec9826 56801458e4
commit 8f3d97291a
3 changed files with 6652 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/citadelstation.dm
+3 -3
View File
@@ -4,8 +4,8 @@
#define MINETYPE "lavaland"
#include "map_files\CitadelStation\CitadelStation-1.0.2.dmm"
#include "map_files\CitadelStation\CitadelStation-1.1.0.dmm"
#ifndef TRAVIS_MASS_MAP_BUILD
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
@@ -19,7 +19,7 @@
#include "map_files\generic\z11.dmm"
#define MAP_PATH "map_files/CitadelStation"
#define MAP_FILE "CitadelStation-1.0.2"
#define MAP_FILE "CitadelStation-1.1.0"
#define MAP_NAME "Citadel Station"
#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG
_maps/map_files/CitadelStation/CitadelStation-1.1.0.dmm
+6646
View File
File diff suppressed because it is too large Load Diff
code/controllers/subsystem/air.dm
+3 -2
View File
@@ -218,8 +218,9 @@ var/datum/subsystem/air/SSair
while(currentrun.len)
var/turf/open/T = currentrun[currentrun.len]
currentrun.len--
if (T)
T.process(fire_count)
if (isturf(T))
T.process_cell(fire_count)
if (MC_TICK_CHECK)
return