Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

This commit is contained in:
Zuhayr
2014-12-23 12:56:42 +10:30
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -24,7 +24,7 @@
if (!istype(loc, /turf/simulated/floor))
usr << "\red APC cannot be placed on this spot."
return
if (A.requires_power == 0 || A.name == "Space")
if (A.requires_power == 0 || istype(A, /area/space))
usr << "\red APC cannot be placed in this area."
return
if (A.get_apc())
+1 -1
View File
@@ -80,7 +80,7 @@ move an amendment</a> to the drawing.</p>
return A
/obj/item/blueprints/proc/get_area_type(var/area/A = get_area())
if (A.name == "Space")
if(istype(A, /area/space))
return AREA_SPACE
var/list/SPECIALS = list(
/area/shuttle,