Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again

This commit is contained in:
Anewbe
2018-06-16 12:39:26 -05:00
33 changed files with 853 additions and 193 deletions

View File

@@ -1,5 +1,4 @@
var/list/turf_edge_cache = list()
var/list/outdoor_turfs = list()
/turf/
// If greater than 0, this turf will apply edge overlays on top of other turfs cardinally adjacent to it, if those adjacent turfs are of a different icon_state,
@@ -24,24 +23,21 @@ var/list/outdoor_turfs = list()
/turf/simulated/floor/New()
if(outdoors)
outdoor_turfs.Add(src)
SSplanets.addTurf(src)
..()
/turf/simulated/floor/Destroy()
if(outdoors)
planet_controller.unallocateTurf(src)
SSplanets.removeTurf(src)
return ..()
/turf/simulated/proc/make_outdoors()
outdoors = TRUE
outdoor_turfs.Add(src)
SSplanets.addTurf(src)
/turf/simulated/proc/make_indoors()
outdoors = FALSE
if(planet_controller)
planet_controller.unallocateTurf(src)
else // This is happening during map gen, if there's no planet_controller (hopefully).
outdoor_turfs -= src
SSplanets.removeTurf(src)
/turf/simulated/post_change()
..()

View File

@@ -14,7 +14,7 @@
/turf/simulated/sky/initialize()
. = ..()
outdoor_turfs.Add(src)
SSplanets.addTurf(src)
set_light(2, 2, "#FFFFFF")
/turf/simulated/sky/north

View File

@@ -1,7 +1,5 @@
// This is a wall you surround the area of your "planet" with, that makes the atmosphere inside stay within bounds, even if canisters
// are opened or other strange things occur.
var/list/planetary_walls = list()
/turf/unsimulated/wall/planetary
name = "railroading"
desc = "Choo choo!"
@@ -21,10 +19,10 @@ var/list/planetary_walls = list()
/turf/unsimulated/wall/planetary/New()
..()
planetary_walls.Add(src)
SSplanets.addTurf(src)
/turf/unsimulated/wall/planetary/Destroy()
planetary_walls.Remove(src)
SSplanets.removeTurf(src)
..()
/turf/unsimulated/wall/planetary/proc/set_temperature(var/new_temperature)