Merge pull request #16625 from KorPhaeron/building

Fixes blueprints not working on lavaland
This commit is contained in:
Cheridan
2016-04-05 10:38:24 -05:00
4 changed files with 9 additions and 2 deletions
+4
View File
@@ -40,6 +40,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/requires_power = 1
var/always_unpowered = 0 // This gets overriden to 1 for space in area/New().
var/outdoors = 0 //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room)
var/power_equip = 1
var/power_light = 1
var/power_environ = 1
@@ -100,6 +102,7 @@ var/list/teleportlocs = list()
power_equip = 0
power_environ = 0
valid_territory = 0
outdoors = 1
ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',)
blob_allowed = 0 //Eating up space doesn't count for victory as a blob.
@@ -223,6 +226,7 @@ var/list/teleportlocs = list()
name = "Asteroid - Underground"
icon_state = "cave"
requires_power = 0
outdoors = 1
/area/asteroid/artifactroom
name = "Asteroid - Artifact"
+2 -2
View File
@@ -28,7 +28,7 @@
<small>[fluffnotice]</small><hr>"
switch(get_area_type())
if(AREA_SPACE)
text += "<p>According to the [src.name], you are now in <b>outer space</b>. Hold your breath.</p> \
text += "<p>According to the [src.name], you are now in an unclaimed territory.</p> \
<p><a href='?src=\ref[src];create_area=1'>Mark this place as new area.</a></p>"
if(AREA_SPECIAL)
text += "<p>This place is not noted on the [src.name].</p>"
@@ -112,7 +112,7 @@
/obj/item/areaeditor/proc/get_area_type(area/A = get_area())
if (istype(A,/area/space))
if(A.outdoors)
return AREA_SPACE
var/list/SPECIALS = list(
/area/shuttle,
@@ -26,3 +26,4 @@
/area/lavaland/surface/outdoors
name = "Lavaland Wastes"
outdoors = 1
+2
View File
@@ -14,6 +14,7 @@
power_environ = 0
power_equip = 0
power_light = 0
outdoors = 1
ambientsounds = list('sound/ambience/ambimine.ogg')
/area/mine/unexplored
@@ -26,6 +27,7 @@
power_environ = 0
power_equip = 0
power_light = 0
outdoors = 1
ambientsounds = list('sound/ambience/ambimine.ogg')
/area/mine/lobby