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

This commit is contained in:
Aurorablade
2016-01-26 21:17:25 -05:00
146 changed files with 1231 additions and 720 deletions
+3
View File
@@ -530,6 +530,9 @@ var/global/list/rockTurfEdgeCache
/turf/simulated/mineral/updateMineralOverlays()
return
/turf/simulated/wall/updateMineralOverlays()
return
/turf/proc/fullUpdateMineralOverlays()
for (var/turf/t in range(1,src))
t.updateMineralOverlays()
+1 -1
View File
@@ -62,7 +62,7 @@
/mining_surprise/human
name="Hidden Complex"
floortypes = list(
/turf/simulated/floor/airless=95,
/turf/simulated/floor/plasteel/airless=95,
/turf/simulated/floor/plating/airless=5
)
walltypes = list(