stuff

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"

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'
 

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
 

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!"))

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

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"

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
 

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"