upstream-merge-28034/compile fix/upstream-merge-28048

2017-06-11 08:12:27 -05:00
parent 9d85cbf3b5
commit bd4d42a8a6
3 changed files with 15 additions and 12 deletions
@@ -1,9 +1,10 @@
 /datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel
 	spawnableTurfs = list(/turf/open/floor/plasteel = 100)
 	var/ignore_wall = FALSE
+	allowAtomsOnSpace = TRUE

 /datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/place(turf/T)
-	if(isclosedturf(T))
+	if(isclosedturf(T) && !ignore_wall)
 		return FALSE
 	return TRUE

@@ -13,6 +14,7 @@
 /datum/mapGeneratorModule/border/normalWalls
 	spawnableAtoms = list()
 	spawnableTurfs = list(/turf/closed/wall = 100)
+	allowAtomsOnSpace = TRUE

 /datum/mapGenerator/repair
 	modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel,