Rebases and redoes it with the fix with mapmerge2

2018-01-12 15:53:00 +01:00
parent 3a2ac4d102
commit 077ec06f78
1 changed files with 2 additions and 4 deletions
@@ -316,7 +316,8 @@
 /area/shuttle/escape)
 "be" = (
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	resistance_flags = 33
 	},
 /turf/open/lava/smooth/airless,
 /area/shuttle/escape)
@@ -328,9 +329,6 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
-"bh" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/escape)
 "bi" = (
 /obj/machinery/light,
 /turf/open/floor/plasteel/darkgreen,