diff --git a/_maps/shuttles/emergency_gorilla.dmm b/_maps/shuttles/emergency_gorilla.dmm
index abfcea8257..0c75cd8b7e 100644
--- a/_maps/shuttles/emergency_gorilla.dmm
+++ b/_maps/shuttles/emergency_gorilla.dmm
@@ -284,9 +284,6 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "be" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
 /obj/structure/chair/sofa/right,
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -363,6 +360,20 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
+"fV" = (
+/turf/closed/wall/r_wall,
+/area/shuttle/escape)
+"IR" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"Pi" = (
+/obj/structure/chair/sofa,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -452,11 +463,11 @@ aP
 av
 av
 ax
-ab
-ad
-ab
+av
+fV
+fV
 bk
-ab
+fV
 bs
 bu
 "}
@@ -476,8 +487,8 @@ aT
 aT
 aT
 aT
-ac
-ac
+aT
+IR
 be
 aN
 bl
@@ -501,7 +512,7 @@ ab
 ad
 ab
 ad
-ad
+fV
 bf
 bl
 bq
@@ -522,11 +533,11 @@ aM
 aP
 aU
 aC
+aC
 aX
 aD
-ad
-ad
-bg
+fV
+Pi
 bm
 bn
 bs
@@ -546,10 +557,10 @@ ad
 ab
 ab
 aC
+aC
 aY
 aX
-ad
-ad
+fV
 bh
 aP
 bq
@@ -570,10 +581,10 @@ aC
 aD
 aC
 ax
+aC
 aZ
 ax
-ac
-ac
+IR
 bg
 bl
 br
@@ -594,14 +605,14 @@ aC
 aQ
 aV
 aC
+aC
 aX
 aD
-ad
-ab
+fV
 bi
 bn
 bl
-ab
+fV
 ab
 "}
 (11,1,1) = {"
@@ -621,10 +632,10 @@ ab
 ad
 ad
 ab
-ad
-ab
-ab
-ad
-ad
+fV
+fV
+fV
+fV
+fV
 aa
 "}
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index 37517668e4..2c04837c79 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -1329,6 +1329,14 @@
 "eP" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/escape)
+"Mb" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Shuttle EVA";
+	req_access_txt = "19"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -1645,7 +1653,7 @@ cs
 ad
 cr
 cs
-aR
+Mb
 cs
 ar
 br