From 077ec06f78518190d2d8ab16f84d75dd5f68d372 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Fri, 12 Jan 2018 15:53:00 +0100 Subject: [PATCH 1/2] Rebases and redoes it with the fix with mapmerge2 --- _maps/shuttles/emergency_wabbajack.dmm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index 9c7fe55f74..7c4b5ea932 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -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,