diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm
index a7ecea552c..2e8da59ed9 100644
--- a/code/game/machinery/computer/dropship_weapons.dm
+++ b/code/game/machinery/computer/dropship_weapons.dm
@@ -732,6 +732,7 @@
 /obj/structure/machinery/computer/dropship_weapons/midway/small
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "cameras"
+	layer = WEATHER_LAYER
 
 /obj/structure/machinery/computer/dropship_weapons/cyclone
 	name = "\improper 'Cyclone' weapons controls"
@@ -740,6 +741,7 @@
 /obj/structure/machinery/computer/dropship_weapons/cyclone/small
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "cameras"
+	layer = WEATHER_LAYER
 
 /obj/structure/machinery/computer/dropship_weapons/tornado
 	name = "\improper 'Tornado' weapons controls"
@@ -748,6 +750,7 @@
 /obj/structure/machinery/computer/dropship_weapons/tornado/small
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "cameras"
+	layer = WEATHER_LAYER
 
 /obj/structure/machinery/computer/dropship_weapons/typhoon
 	name = "\improper 'Typhoon' weapons controls"
@@ -756,6 +759,7 @@
 /obj/structure/machinery/computer/dropship_weapons/typhoon/small
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "cameras"
+	layer = WEATHER_LAYER
 
 /obj/structure/machinery/computer/dropship_weapons/tripoli
 	name = "\improper 'Tripoli' weapons controls"
@@ -764,6 +768,7 @@
 /obj/structure/machinery/computer/dropship_weapons/tripoli/small
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "cameras"
+	layer = WEATHER_LAYER
 
 /obj/structure/machinery/computer/dropship_weapons/dropship1
 	name = "\improper 'Alamo' weapons controls"
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index e571b0f30c..968ef59ef3 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -905,6 +905,9 @@
 /obj/structure/machinery/door/airlock/hatch/cockpit/two
 	icon = 'icons/obj/structures/doors/dropship2_pilot.dmi'
 
+/obj/structure/machinery/door/airlock/hatch/cockpit/four
+	icon = 'icons/obj/structures/doors/dropship4_pilot.dmi'
+
 /obj/structure/machinery/door/airlock/hatch/cockpit/upp
 	icon = 'icons/obj/structures/doors/dropshipupp_pilot.dmi'
 
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index c60c08dc03..0ce41c4733 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -326,6 +326,10 @@
 	name = "\improper Normandy cargo door"
 	icon = 'icons/obj/structures/doors/dropship2_cargo.dmi'
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds4
+	name = "\improper Midway cargo door"
+	icon = 'icons/obj/structures/doors/dropship4_cargo.dmi'
+
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside
 	width = 2
 
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index e523906f4c..6056d859b5 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -367,6 +367,10 @@
 /obj/structure/bed/chair/dropship/passenger/shuttle_chair
 	icon_state = "hotseat"
 
+/obj/structure/bed/chair/dropship/passenger/folded
+	chair_state = DROPSHIP_CHAIR_FOLDED
+	icon_state = "hotseat_new_folded"
+
 /obj/structure/bed/chair/dropship/passenger/BlockedPassDirs(atom/movable/mover, target_dir, height = 0, air_group = 0)
 	if(chair_state == DROPSHIP_CHAIR_UNFOLDED && istype(mover, /obj/vehicle/multitile) && !is_animating)
 		visible_message(SPAN_DANGER("[mover] slams into [src] and breaks it!"))
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 2bbcd2dd66..8a63bfdfcd 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -261,7 +261,7 @@
 
 /turf/closed/shuttle/midway
 	name = "\improper Midway"
-	icon = 'icons/turf/dropship.dmi'
+	icon = 'icons/turf/dropship4.dmi'
 	icon_state = "1"
 
 /turf/closed/shuttle/midway/transparent
@@ -293,7 +293,7 @@
 
 /turf/closed/shuttle/tripoli
 	name = "\improper Tripoli"
-	icon = 'icons/turf/dropship2.dmi'
+	icon = 'icons/turf/dropship.dmi'
 	icon_state = "1"
 
 /turf/closed/shuttle/tripoli/transparent
diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm
index 883faf413f..2081421d88 100644
--- a/code/modules/shuttle/computers/dropship_computer.dm
+++ b/code/modules/shuttle/computers/dropship_computer.dm
@@ -502,7 +502,7 @@
 	needs_power = TRUE
 
 /obj/structure/machinery/computer/shuttle/dropship/flight/toc
-	name = "midway control screen"
+	name = "dropship control screen"
 	desc = "A screen on the TOC computer for controlling the dropship linked to it."
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "toc_shuttle"
diff --git a/code/modules/shuttle/dropship.dm b/code/modules/shuttle/dropship.dm
index b767e16b9f..bf38f9fa3b 100644
--- a/code/modules/shuttle/dropship.dm
+++ b/code/modules/shuttle/dropship.dm
@@ -215,6 +215,24 @@
 /obj/structure/shuttle/part/dropship2/transparent/right_outer_bottom_wing
 	icon_state = "6"
 
+/obj/structure/shuttle/part/midway
+	name = "\improper Midway"
+	icon = 'icons/turf/dropship4.dmi'
+	icon_state = "1"
+	opacity = TRUE
+
+/obj/structure/shuttle/part/midway/transparent
+	opacity = FALSE
+
+/obj/structure/shuttle/part/cyclone
+	name = "\improper Cyclone"
+	icon = 'icons/turf/dropship2.dmi'
+	icon_state = "1"
+	opacity = TRUE
+
+/obj/structure/shuttle/part/cyclone/transparent
+	opacity = FALSE
+
 /obj/structure/shuttle/part/tornado
 	name = "\improper Tornado"
 	icon = 'icons/turf/dropship3.dmi'
@@ -235,7 +253,7 @@
 
 /obj/structure/shuttle/part/tripoli
 	name = "\improper Tripoli"
-	icon = 'icons/turf/dropship2.dmi'
+	icon = 'icons/turf/dropship.dmi'
 	icon_state = "1"
 	opacity = TRUE
 
diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm
index 06217d4cc0..34a6b53357 100644
--- a/code/modules/vehicles/interior/interactable/seats.dm
+++ b/code/modules/vehicles/interior/interactable/seats.dm
@@ -479,3 +479,53 @@
 		REMOVE_TRAIT(M, TRAIT_UNDENSE, BUCKLED_TRAIT)
 
 	handle_rotation()
+
+/obj/structure/bed/chair/vehicle/dropship_cockpit
+	name = "cockpit seat"
+	desc = "A sturdy metal chair with a brace that lowers over your body. Holds you in place during high altitude drops."
+	icon_state = "vehicle_seat"
+	can_rotate = FALSE
+
+/obj/structure/bed/chair/vehicle/dropship_cockpit/afterbuckle(mob/M)
+	if(buckled_mob)
+		if(buckled_mob != M)
+			return
+		icon_state = initial(icon_state) + "_buckled"
+		overlays += chairbar
+
+		if(buckle_offset_x != 0)
+			mob_old_x = M.pixel_x
+			M.pixel_x = buckle_offset_x
+		if(buckle_offset_y != 0)
+			mob_old_y = M.pixel_y
+			M.pixel_y = buckle_offset_y
+
+		ADD_TRAIT(buckled_mob, TRAIT_UNDENSE, BUCKLED_TRAIT)
+	else
+		icon_state = initial(icon_state)
+		overlays -= chairbar
+
+		if(buckle_offset_x != 0)
+			M.pixel_x = mob_old_x
+			mob_old_x = 0
+		if(buckle_offset_y != 0)
+			M.pixel_y = mob_old_y
+			mob_old_y = 0
+
+		REMOVE_TRAIT(M, TRAIT_UNDENSE, BUCKLED_TRAIT)
+
+	handle_rotation()
+
+/obj/structure/bed/chair/vehicle/dropship_cockpit/pilot
+	name = "pilot seat"
+
+/obj/structure/bed/chair/vehicle/dropship_cockpit/pilot/handle_rotation()
+	if(dir == NORTH)
+		layer = ABOVE_MOB_LAYE
+	else
+		layer = BELOW_MOB_LAYER
+	if(buckled_mob)
+		buckled_mob.setDir(dir)
+
+/obj/structure/bed/chair/vehicle/dropship_cockpit/copilot
+	name = "co-pilot seat"
diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi
index 4224992af2..9e3a24f9cc 100644
Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ
diff --git a/icons/turf/dropship3.dmi b/icons/turf/dropship3.dmi
index 882ccc5a42..bd13e33fbb 100644
Binary files a/icons/turf/dropship3.dmi and b/icons/turf/dropship3.dmi differ
diff --git a/maps/shuttles/dropship_cyclone.dmm b/maps/shuttles/dropship_cyclone.dmm
index 6b45726167..83cb61e829 100644
--- a/maps/shuttles/dropship_cyclone.dmm
+++ b/maps/shuttles/dropship_cyclone.dmm
@@ -1,8 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "ag" = (
-/turf/closed/shuttle/cyclone{
-	icon_state = "92";
-	name = "\improper Cyclon"
+/turf/closed/shuttle/cyclone/transparent{
+	icon_state = "86b"
 	},
 /area/shuttle/cyclone)
 "aP" = (
@@ -18,7 +17,8 @@
 /area/shuttle/cyclone)
 "cj" = (
 /obj/structure/shuttle/part/dropship2/nose_front_left{
-	name = "\improper Cyclone"
+	name = "\improper Cyclone";
+	icon_state = "95a"
 	},
 /turf/template_noop,
 /area/shuttle/cyclone)
@@ -72,13 +72,12 @@
 	},
 /area/shuttle/cyclone)
 "eu" = (
-/obj/structure/machinery/light{
-	dir = 8;
-	pixel_x = -14
-	},
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 4
 	},
+/obj/structure/machinery/light/double{
+	dir = 8
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -141,8 +140,19 @@
 /turf/template_noop,
 /area/shuttle/cyclone)
 "ia" = (
-/obj/structure/bed/chair/dropship/pilot{
-	dir = 1
+/obj/structure/stairs/perspective{
+	dir = 1;
+	icon_state = "p_stair_full";
+	pixel_y = 22
+	},
+/obj/structure/bed/chair/vehicle/dropship_cockpit/copilot{
+	dir = 1;
+	layer = 5;
+	pixel_x = 7
+	},
+/obj/structure/machinery/computer/dropship_weapons/cyclone/small{
+	pixel_y = 8;
+	pixel_x = 7
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -155,9 +165,8 @@
 /turf/template_noop,
 /area/shuttle/cyclone)
 "lc" = (
-/obj/structure/machinery/light{
-	dir = 4;
-	pixel_x = 14
+/obj/structure/machinery/light/double{
+	dir = 4
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin3"
@@ -172,6 +181,10 @@
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_y = 26;
+	pixel_x = -10
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -236,9 +249,8 @@
 /turf/template_noop,
 /area/shuttle/cyclone)
 "qj" = (
-/obj/structure/machinery/light{
-	dir = 8;
-	pixel_x = -14
+/obj/structure/machinery/light/double{
+	dir = 8
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin3"
@@ -261,7 +273,8 @@
 /area/shuttle/cyclone)
 "ro" = (
 /obj/structure/shuttle/part/dropship2/nose_front_right{
-	name = "\improper Cyclone"
+	name = "\improper Cyclone";
+	icon_state = "99a"
 	},
 /turf/template_noop,
 /area/shuttle/cyclone)
@@ -300,7 +313,7 @@
 /area/shuttle/cyclone)
 "vt" = (
 /turf/closed/shuttle/cyclone/transparent{
-	icon_state = "86"
+	icon_state = "86a"
 	},
 /area/shuttle/cyclone)
 "vH" = (
@@ -388,15 +401,23 @@
 /area/shuttle/cyclone)
 "Bt" = (
 /turf/closed/shuttle/cyclone/transparent{
-	icon_state = "89"
+	icon_state = "89a"
 	},
 /area/shuttle/cyclone)
 "BU" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_x = 30
+	pixel_y = 26;
+	pixel_x = 10
+	},
+/obj/structure/extinguisher_cabinet/lifeboat{
+	pixel_y = 27;
+	pixel_x = -2
 	},
 /turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
+	icon_state = "rasputin15"
 	},
 /area/shuttle/cyclone)
 "Cb" = (
@@ -444,13 +465,12 @@
 	},
 /area/shuttle/cyclone)
 "FD" = (
-/obj/structure/machinery/light{
-	dir = 4;
-	pixel_x = 14
-	},
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
+/obj/structure/machinery/light/double{
+	dir = 4
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -502,7 +522,7 @@
 	},
 /area/shuttle/cyclone)
 "KQ" = (
-/obj/structure/bed/chair/dropship/passenger,
+/obj/structure/bed/chair/dropship/passenger/folded,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -512,17 +532,6 @@
 	icon_state = "rasputin8"
 	},
 /area/shuttle/cyclone)
-"MD" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_x = -30
-	},
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/shuttle/cyclone)
 "MU" = (
 /obj/structure/shuttle/part/dropship2/transparent/outer_left_weapons{
 	name = "\improper Cyclone"
@@ -536,8 +545,15 @@
 	},
 /area/shuttle/cyclone)
 "Pg" = (
-/obj/structure/blocker/invisible_wall,
-/obj/structure/machinery/computer/shuttle/dropship/flight,
+/obj/structure/bed/chair/vehicle{
+	dir = 1;
+	pixel_x = 7;
+	layer = 4.1
+	},
+/obj/structure/machinery/computer/shuttle/dropship/flight/small{
+	pixel_y = 8;
+	pixel_x = 7
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -598,12 +614,12 @@
 /area/shuttle/cyclone)
 "XU" = (
 /turf/closed/shuttle/cyclone/transparent{
-	icon_state = "97"
+	icon_state = "97a"
 	},
 /area/shuttle/cyclone)
 "XY" = (
-/turf/closed/shuttle/cyclone{
-	icon_state = "94"
+/turf/closed/shuttle/cyclone/transparent{
+	icon_state = "89b"
 	},
 /area/shuttle/cyclone)
 "YL" = (
@@ -665,8 +681,8 @@ wk
 wk
 xY
 Sl
+BU
 sR
-MD
 eu
 cJ
 qs
@@ -724,7 +740,7 @@ Sk
 Sk
 KU
 yP
-BU
+Sk
 Sk
 lc
 Ty
diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm
index e0e6a5b830..fdb5cb1b62 100644
--- a/maps/shuttles/dropship_midway.dmm
+++ b/maps/shuttles/dropship_midway.dmm
@@ -5,18 +5,19 @@
 	},
 /area/shuttle/midway)
 "bm" = (
-/obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "17"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "dr" = (
-/obj/structure/shuttle/part/dropship1/lower_left_wall{
-	name = "\improper Midway"
-	},
 /obj/structure/shuttle/part/dropship2/transparent/engine_right_cap{
 	name = "\improper Midway"
 	},
+/obj/structure/shuttle/part/midway{
+	icon_state = "46";
+	layer = 2.9
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "dB" = (
@@ -36,8 +37,8 @@
 	},
 /area/shuttle/midway)
 "eu" = (
-/obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "2"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
@@ -55,7 +56,7 @@
 	},
 /area/shuttle/midway)
 "hO" = (
-/obj/structure/bed/chair/dropship/passenger,
+/obj/structure/bed/chair/dropship/passenger/folded,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -66,8 +67,8 @@
 	},
 /area/shuttle/midway)
 "im" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_top_left{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "100"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
@@ -107,8 +108,8 @@
 	},
 /area/shuttle/midway)
 "kC" = (
-/obj/structure/shuttle/part/dropship1/right_inner_wing_connector{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "8"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
@@ -123,41 +124,47 @@
 	},
 /area/shuttle/midway)
 "mh" = (
-/obj/structure/shuttle/part/dropship1/right_outer_wing_connector{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "4"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "mE" = (
-/obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing{
-	name = "\improper Midway"
-	},
+/obj/structure/shuttle/part/midway/transparent,
 /turf/template_noop,
 /area/shuttle/midway)
 "mG" = (
-/obj/structure/shuttle/part/dropship1/transparent/upper_left_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "71"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "mR" = (
-/obj/structure/shuttle/part/dropship1/nose_front_left{
-	name = "\improper Midway";
+/obj/structure/shuttle/part/midway/transparent{
 	icon_state = "95a"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
+"np" = (
+/turf/template_noop,
+/area/shuttle/midway)
 "nH" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_center{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "101"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "od" = (
-/obj/structure/shuttle/part/dropship1/transparent/middle_left_wing{
-	name = "\improper Midway"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S";
+	pixel_y = 1
+	},
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin14"
 	},
-/turf/template_noop,
 /area/shuttle/midway)
 "ro" = (
 /turf/closed/shuttle/midway/transparent{
@@ -195,12 +202,14 @@
 	icon_state = "31"
 	},
 /area/shuttle/midway)
-"tf" = (
-/obj/structure/bed/chair/vehicle{
-	dir = 1;
-	pixel_x = 7;
-	layer = 3.1
+"sq" = (
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "61"
 	},
+/obj/effect/attach_point/weapon/midway/left_wing,
+/turf/template_noop,
+/area/shuttle/midway)
+"tf" = (
 /obj/structure/stairs/perspective{
 	dir = 1;
 	icon_state = "p_stair_full";
@@ -208,8 +217,12 @@
 	},
 /obj/structure/machinery/computer/dropship_weapons/tornado/small{
 	pixel_y = 8;
-	pixel_x = 7;
-	layer = 3.05
+	pixel_x = 7
+	},
+/obj/structure/bed/chair/vehicle/dropship_cockpit/copilot{
+	dir = 1;
+	layer = 5;
+	pixel_x = 7
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -238,8 +251,8 @@
 	},
 /area/shuttle/midway)
 "tP" = (
-/obj/structure/shuttle/part/dropship1/transparent/right_outer_bottom_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "6"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
@@ -259,8 +272,8 @@
 	},
 /area/shuttle/midway)
 "vN" = (
-/obj/structure/shuttle/part/dropship1/transparent/middle_right_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "70"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
@@ -294,6 +307,10 @@
 	dir = 8;
 	pixel_x = 23
 	},
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_y = 26;
+	pixel_x = -10
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -321,6 +338,10 @@
 /obj/structure/platform_decoration{
 	dir = 8
 	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin3"
 	},
@@ -331,7 +352,9 @@
 	},
 /area/shuttle/midway)
 "Aw" = (
-/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons,
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "85"
+	},
 /obj/effect/attach_point/weapon/midway/left_fore,
 /turf/template_noop,
 /area/shuttle/midway)
@@ -351,14 +374,14 @@
 	},
 /area/shuttle/midway)
 "BU" = (
-/obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "16"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "Cc" = (
-/obj/structure/shuttle/part/dropship1/left_outer_wing_connector{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "3"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
@@ -401,28 +424,27 @@
 	},
 /area/shuttle/midway)
 "EN" = (
-/obj/structure/shuttle/part/dropship1/nose_front_right{
-	name = "\improper Midway";
+/obj/structure/shuttle/part/midway/transparent{
 	icon_state = "99a"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "Fu" = (
-/obj/structure/shuttle/part/dropship1/transparent/lower_right_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "65"
 	},
 /obj/effect/attach_point/weapon/midway/right_wing,
 /turf/template_noop,
 /area/shuttle/midway)
 "Gh" = (
-/obj/structure/shuttle/part/dropship1/left_inner_wing_connector{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "7"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "Go" = (
-/obj/structure/shuttle/part/dropship1/transparent/outer_left_weapons{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "84"
 	},
 /obj/effect/attach_point/electronics/midway,
 /turf/template_noop,
@@ -435,24 +457,28 @@
 "Hz" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 1;
-	pixel_x = 7
+	pixel_x = 7;
+	layer = 4.1
 	},
-/obj/structure/machinery/computer/dropship_weapons/tornado/small{
+/obj/structure/machinery/computer/shuttle/dropship/flight/small{
 	pixel_y = 8;
-	pixel_x = 7;
-	layer = 2.9
+	pixel_x = 7
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
 /area/shuttle/midway)
 "HY" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1{
-	id = "aft_door";
-	name = "\improper Midway rear door"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S";
+	pixel_y = 1
 	},
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds4,
 /turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
+	icon_state = "rasputin14"
 	},
 /area/shuttle/midway)
 "Id" = (
@@ -472,10 +498,9 @@
 	},
 /area/shuttle/midway)
 "Ks" = (
-/obj/structure/shuttle/part/dropship1/transparent/lower_left_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "66"
 	},
-/obj/effect/attach_point/weapon/midway/left_wing,
 /turf/template_noop,
 /area/shuttle/midway)
 "Kv" = (
@@ -501,13 +526,17 @@
 /obj/structure/platform_decoration{
 	dir = 4
 	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin3"
 	},
 /area/shuttle/midway)
 "LZ" = (
-/obj/structure/shuttle/part/dropship1/transparent/upper_right_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "74"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
@@ -527,17 +556,18 @@
 	},
 /area/shuttle/midway)
 "Pc" = (
-/obj/structure/shuttle/part/dropship1/lower_right_wall{
-	name = "\improper Midway"
-	},
 /obj/structure/shuttle/part/dropship2/transparent/engine_left_cap{
 	name = "\improper Midway"
 	},
+/obj/structure/shuttle/part/midway{
+	icon_state = "49";
+	layer = 2.9
+	},
 /turf/template_noop,
 /area/shuttle/midway)
 "PP" = (
-/obj/structure/machinery/door/airlock/hatch/cockpit,
 /obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/structure/machinery/door/airlock/hatch/cockpit/four,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -561,20 +591,28 @@
 	icon_state = "rasputin15"
 	},
 /area/shuttle/midway)
+"SR" = (
+/obj/effect/attach_point/crew_weapon/midway,
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin3"
+	},
+/area/shuttle/midway)
 "SZ" = (
-/obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "5"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "Tl" = (
-/obj/structure/shuttle/part/dropship1/transparent/nose_top_right{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "102"
 	},
 /turf/template_noop,
 /area/shuttle/midway)
 "UI" = (
-/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons,
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "90"
+	},
 /obj/effect/attach_point/weapon/midway/right_fore,
 /turf/template_noop,
 /area/shuttle/midway)
@@ -610,8 +648,8 @@
 	},
 /area/shuttle/midway)
 "Zr" = (
-/obj/structure/shuttle/part/dropship1/transparent/outer_right_weapons{
-	name = "\improper Midway"
+/obj/structure/shuttle/part/midway/transparent{
+	icon_state = "91"
 	},
 /obj/effect/attach_point/electronics/midway,
 /turf/template_noop,
@@ -629,9 +667,9 @@ Kw
 Kw
 Kw
 mG
-od
 Ks
-Kw
+sq
+np
 dB
 Mz
 Cm
@@ -706,9 +744,9 @@ ME
 Id
 DH
 jW
+SR
 jW
-jW
-ME
+od
 Kw
 Kw
 "}
@@ -726,7 +764,7 @@ yO
 Kv
 jW
 jW
-ME
+od
 Kw
 Kw
 "}
@@ -775,7 +813,7 @@ Kw
 LZ
 vN
 Fu
-Kw
+np
 yN
 OB
 XH
diff --git a/maps/shuttles/dropship_tornado.dmm b/maps/shuttles/dropship_tornado.dmm
index 469125affc..d7ccb13255 100644
--- a/maps/shuttles/dropship_tornado.dmm
+++ b/maps/shuttles/dropship_tornado.dmm
@@ -57,11 +57,10 @@
 	},
 /area/shuttle/tornado)
 "db" = (
-/obj/structure/shuttle/part/tornado/transparent{
-	icon_state = "65"
+/obj/structure/bed/chair/dropship/passenger/folded,
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
 	},
-/obj/effect/attach_point/weapon/tornado/right_wing,
-/turf/template_noop,
 /area/shuttle/tornado)
 "dm" = (
 /obj/structure/shuttle/part/tornado/transparent{
@@ -107,20 +106,19 @@
 	},
 /area/shuttle/tornado)
 "fr" = (
-/obj/structure/bed/chair/vehicle{
-	pixel_x = -8;
-	dir = 1;
-	layer = 3.2
-	},
 /obj/structure/stairs/perspective{
 	dir = 1;
 	icon_state = "p_stair_full";
 	pixel_y = 22
 	},
+/obj/structure/bed/chair/vehicle/dropship_cockpit/copilot{
+	dir = 1;
+	layer = 5;
+	pixel_x = 7
+	},
 /obj/structure/machinery/computer/dropship_weapons/tornado/small{
 	pixel_y = 8;
-	pixel_x = -8;
-	layer = 3.1
+	pixel_x = 7
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -188,10 +186,17 @@
 /area/shuttle/tornado)
 "mt" = (
 /obj/docking_port/mobile/marine_dropship/tornado,
+/obj/structure/bed/chair/dropship/passenger/folded,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
 /area/shuttle/tornado)
+"ni" = (
+/turf/closed/shuttle/dropship2/tornado{
+	icon_state = "89a";
+	opacity = 0
+	},
+/area/shuttle/tornado)
 "pv" = (
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin4"
@@ -205,7 +210,7 @@
 /area/shuttle/tornado)
 "rp" = (
 /turf/closed/shuttle/dropship2/tornado{
-	icon_state = "89";
+	icon_state = "89b";
 	opacity = 0
 	},
 /area/shuttle/tornado)
@@ -235,12 +240,13 @@
 /area/shuttle/tornado)
 "uL" = (
 /obj/structure/bed/chair/vehicle{
-	pixel_x = -8;
-	dir = 1
+	dir = 1;
+	pixel_x = 7;
+	layer = 4.1
 	},
 /obj/structure/machinery/computer/shuttle/dropship/flight/small{
 	pixel_y = 8;
-	pixel_x = -8
+	pixel_x = 7
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -254,7 +260,7 @@
 /area/shuttle/tornado)
 "vz" = (
 /obj/structure/shuttle/part/tornado/transparent{
-	icon_state = "95"
+	icon_state = "95a"
 	},
 /turf/template_noop,
 /area/shuttle/tornado)
@@ -336,10 +342,14 @@
 	},
 /area/shuttle/tornado)
 "BK" = (
+/obj/structure/shuttle/part/tornado/transparent{
+	icon_state = "41";
+	layer = 4.2;
+	density = 0
+	},
 /obj/structure/shuttle/part/tornado/transparent{
 	icon_state = "61"
 	},
-/obj/effect/attach_point/weapon/tornado/left_wing,
 /turf/template_noop,
 /area/shuttle/tornado)
 "DX" = (
@@ -437,7 +447,7 @@
 /area/shuttle/tornado)
 "Mq" = (
 /turf/closed/shuttle/dropship2/tornado{
-	icon_state = "86";
+	icon_state = "86b";
 	opacity = 0
 	},
 /area/shuttle/tornado)
@@ -501,12 +511,29 @@
 	icon_state = "rasputin6"
 	},
 /area/shuttle/tornado)
+"QR" = (
+/obj/structure/shuttle/part/tornado/transparent{
+	icon_state = "40";
+	density = 0;
+	layer = 4.2
+	},
+/obj/structure/shuttle/part/tornado/transparent{
+	icon_state = "65"
+	},
+/turf/template_noop,
+/area/shuttle/tornado)
 "Rk" = (
 /obj/structure/shuttle/part/tornado/transparent{
-	icon_state = "99"
+	icon_state = "99a"
 	},
 /turf/template_noop,
 /area/shuttle/tornado)
+"Sa" = (
+/turf/closed/shuttle/dropship2/tornado{
+	icon_state = "86a";
+	opacity = 0
+	},
+/area/shuttle/tornado)
 "SX" = (
 /obj/structure/machinery/door/airlock/hatch/cockpit/two,
 /obj/structure/blocker/forcefield/multitile_vehicles,
@@ -559,7 +586,7 @@
 /area/shuttle/tornado)
 "Ws" = (
 /turf/closed/shuttle/dropship2/tornado{
-	icon_state = "97";
+	icon_state = "97a";
 	opacity = 0
 	},
 /area/shuttle/tornado)
@@ -629,8 +656,8 @@ Om
 Om
 aG
 bL
+bL
 BK
-Nd
 ck
 Wv
 eU
@@ -649,9 +676,9 @@ kI
 av
 yZ
 Zi
+Zi
 sM
 Wt
-Wt
 Yg
 FD
 Jt
@@ -685,7 +712,7 @@ bf
 sx
 vz
 Mq
-Wt
+Sa
 lb
 Qv
 TM
@@ -709,9 +736,9 @@ fr
 SX
 Vj
 mb
-TF
+db
 mt
-TF
+db
 mb
 Vj
 xW
@@ -725,7 +752,7 @@ Om
 Pi
 Rk
 rp
-Ym
+ni
 lb
 jP
 TM
@@ -769,9 +796,9 @@ Nd
 XL
 Tz
 NY
+NY
 bm
 Ym
-Ym
 Gl
 dW
 lM
@@ -789,8 +816,8 @@ Om
 Om
 vk
 Qf
-db
-kI
+Qf
+QR
 dm
 IZ
 zp
diff --git a/maps/shuttles/dropship_tripoli.dmm b/maps/shuttles/dropship_tripoli.dmm
index 6dabd43909..560122ed56 100644
--- a/maps/shuttles/dropship_tripoli.dmm
+++ b/maps/shuttles/dropship_tripoli.dmm
@@ -1,12 +1,13 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aP" = (
 /obj/structure/bed/chair/vehicle{
-	pixel_x = -8;
-	dir = 1
+	dir = 1;
+	pixel_x = 7;
+	layer = 4.1
 	},
 /obj/structure/machinery/computer/shuttle/dropship/flight/small{
 	pixel_y = 8;
-	pixel_x = -8
+	pixel_x = 7
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -242,16 +243,15 @@
 	},
 /area/shuttle/tripoli)
 "vi" = (
-/obj/structure/machinery/door/airlock/hatch/cockpit/two,
 /obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/structure/machinery/door/airlock/hatch/cockpit,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
 /area/shuttle/tripoli)
 "vl" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds2{
-	name = "\improper Tripoli rear door";
-	id = "aft_door"
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1{
+	name = "\improper Tripoli cargo door"
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -281,12 +281,9 @@
 /turf/template_noop,
 /area/shuttle/tripoli)
 "wi" = (
-/obj/structure/bed/chair/dropship/passenger{
-	pixel_y = 15;
-	buckling_y = 15
-	},
+/obj/effect/attach_point/crew_weapon/midway,
 /turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
+	icon_state = "rasputin3"
 	},
 /area/shuttle/tripoli)
 "wy" = (
@@ -413,6 +410,10 @@
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_y = 26;
+	pixel_x = -10
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -470,15 +471,19 @@
 	},
 /area/shuttle/tripoli)
 "Kk" = (
-/obj/structure/bed/chair/vehicle{
-	pixel_x = -8;
+/obj/structure/stairs/perspective{
+	dir = 1;
+	icon_state = "p_stair_full";
+	pixel_y = 22
+	},
+/obj/structure/bed/chair/vehicle/dropship_cockpit/copilot{
 	dir = 1;
-	layer = 3.2
+	layer = 5;
+	pixel_x = 7
 	},
 /obj/structure/machinery/computer/dropship_weapons/tripoli/small{
 	pixel_y = 8;
-	pixel_x = -8;
-	layer = 3.1
+	pixel_x = 7
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -491,8 +496,9 @@
 /turf/template_noop,
 /area/shuttle/tripoli)
 "KZ" = (
+/obj/structure/bed/chair/dropship/passenger/folded,
 /turf/open/shuttle/dropship{
-	icon_state = "rasputin14"
+	icon_state = "rasputin15"
 	},
 /area/shuttle/tripoli)
 "Ly" = (
@@ -714,9 +720,9 @@ ih
 Ac
 lv
 DG
-KZ
-KZ
-KZ
+zZ
+zZ
+zZ
 cE
 QS
 jR
@@ -732,13 +738,13 @@ dN
 aP
 Kk
 vi
+zZ
 KZ
-KZ
-wi
+zZ
 RK
 Ze
 kS
-kS
+wi
 kS
 zZ
 ed
@@ -750,9 +756,9 @@ WS
 hS
 RD
 Gt
-KZ
-KZ
-KZ
+zZ
+zZ
+zZ
 AC
 pm
 ZT
diff --git a/maps/shuttles/dropship_typhoon.dmm b/maps/shuttles/dropship_typhoon.dmm
index ef95e3b79f..6a8787701e 100644
--- a/maps/shuttles/dropship_typhoon.dmm
+++ b/maps/shuttles/dropship_typhoon.dmm
@@ -24,9 +24,14 @@
 	icon_state = "75"
 	},
 /area/shuttle/tornado)
+"et" = (
+/turf/closed/shuttle/typhoon{
+	icon_state = "77"
+	},
+/area/shuttle/tornado)
 "fJ" = (
 /obj/structure/shuttle/part/typhoon/transparent{
-	icon_state = "99"
+	icon_state = "99a"
 	},
 /turf/template_noop,
 /area/shuttle/tornado)
@@ -49,6 +54,9 @@
 	dir = 8;
 	pixel_x = 24
 	},
+/obj/structure/platform_decoration{
+	dir = 4
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -67,6 +75,9 @@
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 4
 	},
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
+	pixel_y = 25
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin7"
 	},
@@ -83,11 +94,12 @@
 /turf/template_noop,
 /area/shuttle/tornado)
 "kg" = (
-/obj/structure/shuttle/part/typhoon/transparent{
-	icon_state = "65"
+/obj/structure/platform{
+	dir = 1
+	},
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin3"
 	},
-/obj/effect/attach_point/weapon/tornado/right_wing,
-/turf/template_noop,
 /area/shuttle/tornado)
 "lm" = (
 /obj/structure/machinery/light/double{
@@ -126,13 +138,16 @@
 /obj/structure/platform{
 	dir = 4
 	},
+/obj/structure/platform{
+	dir = 8
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
 /area/shuttle/tornado)
 "oH" = (
 /obj/structure/shuttle/part/typhoon/transparent{
-	icon_state = "95"
+	icon_state = "95a"
 	},
 /turf/template_noop,
 /area/shuttle/tornado)
@@ -178,10 +193,14 @@
 /turf/open/space/basic,
 /area/shuttle/tornado)
 "vO" = (
+/obj/structure/shuttle/part/typhoon/transparent{
+	icon_state = "41";
+	density = 0;
+	layer = 4.2
+	},
 /obj/structure/shuttle/part/typhoon/transparent{
 	icon_state = "61"
 	},
-/obj/effect/attach_point/weapon/tornado/left_wing,
 /turf/template_noop,
 /area/shuttle/tornado)
 "wd" = (
@@ -214,12 +233,8 @@
 	},
 /area/shuttle/tornado)
 "yk" = (
-/obj/structure/stairs/perspective{
-	icon_state = "p_stair_full";
-	can_block_movement = 0
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin3"
+/turf/closed/shuttle/typhoon/transparent{
+	icon_state = "89a"
 	},
 /area/shuttle/tornado)
 "yE" = (
@@ -231,9 +246,8 @@
 /turf/template_noop,
 /area/shuttle/tornado)
 "zS" = (
-/turf/closed/shuttle/typhoon{
-	icon_state = "89";
-	opacity = 0
+/turf/closed/shuttle/typhoon/transparent{
+	icon_state = "89b"
 	},
 /area/shuttle/tornado)
 "Au" = (
@@ -246,6 +260,9 @@
 /obj/structure/platform_decoration{
 	dir = 4
 	},
+/obj/structure/platform_decoration{
+	dir = 8
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -278,9 +295,8 @@
 /turf/template_noop,
 /area/shuttle/tornado)
 "CE" = (
-/turf/closed/shuttle/typhoon{
-	icon_state = "86";
-	opacity = 0
+/turf/closed/shuttle/typhoon/transparent{
+	icon_state = "86b"
 	},
 /area/shuttle/tornado)
 "Dl" = (
@@ -295,11 +311,16 @@
 /turf/template_noop,
 /area/shuttle/tornado)
 "Eh" = (
-/obj/docking_port/mobile/marine_dropship/typhoon,
+/obj/effect/attach_point/crew_weapon/typhoon,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
 /area/shuttle/tornado)
+"Fm" = (
+/turf/closed/shuttle/typhoon/transparent{
+	icon_state = "86a"
+	},
+/area/shuttle/tornado)
 "FC" = (
 /obj/structure/machinery/light/double{
 	dir = 4;
@@ -422,9 +443,8 @@
 	},
 /area/shuttle/tornado)
 "MB" = (
-/turf/closed/shuttle/typhoon{
-	icon_state = "97";
-	opacity = 0
+/turf/closed/shuttle/typhoon/transparent{
+	icon_state = "97a"
 	},
 /area/shuttle/tornado)
 "NB" = (
@@ -446,6 +466,9 @@
 	dir = 4;
 	pixel_x = -24
 	},
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -457,7 +480,7 @@
 /area/shuttle/tornado)
 "Ou" = (
 /obj/structure/bed/chair/vehicle{
-	pixel_x = -8;
+	pixel_x = 8;
 	dir = 1;
 	layer = 3.2
 	},
@@ -470,7 +493,7 @@
 	icon = 'icons/obj/structures/machinery/computer.dmi';
 	icon_state = "cameras";
 	layer = 3.1;
-	pixel_x = -8;
+	pixel_x = 8;
 	pixel_y = 3;
 	density = 0
 	},
@@ -486,6 +509,9 @@
 /obj/structure/platform{
 	dir = 8
 	},
+/obj/structure/platform{
+	dir = 4
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -496,6 +522,12 @@
 	},
 /turf/template_noop,
 /area/shuttle/tornado)
+"Pq" = (
+/obj/docking_port/mobile/marine_dropship/typhoon,
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
+	},
+/area/shuttle/tornado)
 "Qi" = (
 /obj/structure/shuttle/part/typhoon/transparent{
 	icon_state = "38"
@@ -559,12 +591,15 @@
 /turf/template_noop,
 /area/shuttle/tornado)
 "TF" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
-	pixel_x = 30
+/obj/structure/shuttle/part/typhoon/transparent{
+	icon_state = "40";
+	density = 0;
+	layer = 4.2
 	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
+/obj/structure/shuttle/part/typhoon/transparent{
+	icon_state = "65"
 	},
+/turf/template_noop,
 /area/shuttle/tornado)
 "Uk" = (
 /obj/structure/shuttle/part/typhoon/transparent,
@@ -577,14 +612,6 @@
 /obj/structure/surface/table/reinforced/toc/east{
 	pixel_y = -7
 	},
-/obj/structure/machinery/prop/almayer/CICmap{
-	density = 0;
-	icon_state = "toc_map";
-	layer = 2.99;
-	name = "Tactical Map Display";
-	pixel_y = 13;
-	pixel_x = -7
-	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin6"
 	},
@@ -605,10 +632,10 @@
 	icon_state = "cameras_old";
 	pixel_y = 7;
 	icon = 'icons/obj/structures/machinery/computer.dmi';
-	pixel_x = -8
+	pixel_x = 8
 	},
 /obj/structure/bed/chair/vehicle{
-	pixel_x = -8;
+	pixel_x = 8;
 	dir = 1
 	},
 /turf/open/shuttle/dropship{
@@ -646,9 +673,9 @@
 /obj/structure/surface/table/reinforced/toc/west{
 	pixel_y = -7
 	},
-/obj/structure/machinery/computer/shuttle/dropship/flight/toc{
-	pixel_y = 14;
-	pixel_x = 7
+/obj/structure/machinery/prop/almayer/CICmap/arc{
+	pixel_y = 9;
+	pixel_x = -9
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -704,8 +731,8 @@ aX
 aX
 YW
 cg
+cg
 vO
-yE
 RB
 Rb
 JT
@@ -724,9 +751,9 @@ IT
 dV
 rO
 gY
+gY
 QF
 wd
-wd
 Zk
 gN
 VM
@@ -741,7 +768,7 @@ aX
 aX
 aX
 yE
-Or
+et
 Ym
 KY
 cH
@@ -760,7 +787,7 @@ uS
 FO
 oH
 CE
-wd
+Fm
 Or
 Ut
 ZD
@@ -785,12 +812,12 @@ Qs
 iz
 cH
 cH
-Eh
-cH
 cH
+Pq
+Eh
 iz
-yk
-ZD
+cH
+kg
 sC
 ZD
 cH
@@ -800,8 +827,8 @@ aX
 jt
 fJ
 zS
-ZR
-Or
+yk
+et
 ix
 ZD
 ZD
@@ -821,12 +848,12 @@ aX
 aX
 aX
 IT
-Or
+et
 rN
 XO
-TF
 cH
 wP
+wP
 FC
 wP
 lM
@@ -844,9 +871,9 @@ yE
 Dl
 lA
 xq
+xq
 nM
 ZR
-ZR
 Rw
 of
 BO
@@ -864,8 +891,8 @@ aX
 aX
 Sc
 Gv
-kg
-IT
+Gv
+TF
 Qi
 Xw
 IX