Midway

code/__DEFINES/camera.dm

@@ -1,10 +1,12 @@
 // Networks
 #define CAMERA_NET_ALMAYER "Almayer"
+#define CAMERA_NET_GOLDEN_ARROW "Golden Arrow"
 #define CAMERA_NET_CONTAINMENT "Containment"
 #define CAMERA_NET_CONTAINMENT_HIDDEN "Containment Hidden"
 #define CAMERA_NET_RESEARCH "Research"
 #define CAMERA_NET_ALAMO "Alamo"
 #define CAMERA_NET_NORMANDY "Normandy"
+#define CAMERA_NET_MIDWAY "Midway"
 #define CAMERA_NET_COLONY "Colony"
 #define CAMERA_NET_ARES "ARES"
 

code/__DEFINES/shuttles.dm

@@ -111,12 +111,15 @@
 #define MOBILE_SHUTTLE_LIFEBOAT_STARBOARD "lifeboat-starboard"
 #define MOBILE_SHUTTLE_VEHICLE_ELEVATOR "vehicle_elevator"
 
+#define DROPSHIP_MIDWAY "dropship_midway"
 #define DROPSHIP_ALAMO "dropship_alamo"
 #define DROPSHIP_NORMANDY "dropship_normandy"
 
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"
 
+#define GOLDEN_ARROW_LZ "golden arrow lz"
+
 #define DROPSHIP_FLYBY_ID "special_flight"
 #define DROPSHIP_LZ1 "dropship-lz1"
 #define DROPSHIP_LZ2 "dropship-lz2"

code/game/area/Sulaco.dm

@@ -110,8 +110,18 @@
 	name = "\improper Normandy Landing Zone"
 	icon_state = "away2"
 
+/area/shuttle/midway
+	name = "\improper Dropship Midway"
+	icon_state = "shuttlered"
+	base_muffle = MUFFLE_HIGH
+	soundscape_interval = 30
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
 
-
+/area/shuttle/midway/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
 
 
 //DISTRESS SHUTTLES

code/game/machinery/camera/presets.dm

@@ -114,6 +114,13 @@
 	name = "ares core camera"
 	network = list(CAMERA_NET_ALMAYER, CAMERA_NET_ARES)
 
+/obj/structure/machinery/camera/autoname/golden_arrow
+	name = "military-grade camera"
+	network = list(CAMERA_NET_GOLDEN_ARROW)
+
+/obj/structure/machinery/camera/autoname/golden_arrow/midway
+	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_MIDWAY)
+
 //used by the landing camera dropship equipment. Do not place them right under where the dropship lands.
 //Should place them near each corner of your LZs.
 /obj/structure/machinery/camera/autoname/lz_camera

code/game/machinery/computer/camera_console.dm

@@ -377,4 +377,8 @@
 	name = "\improper 'Normandy' camera controls"
 	network = list(CAMERA_NET_NORMANDY, CAMERA_NET_LASER_TARGETS)
 
+/obj/structure/machinery/computer/cameras/dropship/midway
+	name = "\improper 'Midway' camera controls"
+	network = list(CAMERA_NET_MIDWAY, CAMERA_NET_LASER_TARGETS)
+
 #undef DEFAULT_MAP_SIZE

code/game/machinery/computer/dropship_weapons.dm

@@ -9,6 +9,7 @@
 	unslashable = TRUE
 	unacidable = TRUE
 	exproof = TRUE
+
 	var/shuttle_tag  // Used to know which shuttle we're linked to.
 	var/obj/structure/dropship_equipment/selected_equipment //the currently selected equipment installed on the shuttle this console controls.
 	var/list/shuttle_equipments = list() //list of the equipments on the shuttle this console controls
@@ -28,6 +29,8 @@
 /obj/structure/machinery/computer/dropship_weapons/Initialize()
 	. = ..()
 	simulation = new()
+	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
+	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
 
 /obj/structure/machinery/computer/dropship_weapons/New()
 	..()
@@ -717,29 +720,23 @@
 	else
 		firemission_envelope.change_current_loc(shootloc)
 
+/obj/structure/machinery/computer/dropship_weapons/Destroy()
+	. = ..()
+
+	QDEL_NULL(firemission_envelope)
+
+/obj/structure/machinery/computer/dropship_weapons/midway
+	name = "\improper 'Midway' weapons controls"
+	shuttle_tag = DROPSHIP_MIDWAY
+
 /obj/structure/machinery/computer/dropship_weapons/dropship1
 	name = "\improper 'Alamo' weapons controls"
-	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
-	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
-
-/obj/structure/machinery/computer/dropship_weapons/dropship1/New()
-	..()
 	shuttle_tag = DROPSHIP_ALAMO
 
 /obj/structure/machinery/computer/dropship_weapons/dropship2
 	name = "\improper 'Normandy' weapons controls"
-	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
-	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
-
-/obj/structure/machinery/computer/dropship_weapons/dropship2/New()
-	..()
 	shuttle_tag = DROPSHIP_NORMANDY
 
-/obj/structure/machinery/computer/dropship_weapons/Destroy()
-	. = ..()
-
-	QDEL_NULL(firemission_envelope)
-
 // CAS TGUI SHIT \\
 
 /obj/structure/machinery/computer/dropship_weapons/tgui_interact(mob/user, datum/tgui/ui)

code/game/turfs/closed.dm

@@ -259,6 +259,14 @@
 /turf/closed/shuttle/dropship2/transparent
 	opacity = FALSE
 
+/turf/closed/shuttle/midway
+	name = "\improper Midway"
+	icon = 'icons/turf/dropship.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/midway/transparent
+	opacity = FALSE
+
 /turf/closed/shuttle/twe_dropship
 	name = "\improper UD4-UK"
 	icon = 'icons/turf/twedropship.dmi'

code/modules/cm_marines/dropship_equipment.dm

@@ -261,7 +261,8 @@
 		deployed_turret.linked_cam.network = list(CAMERA_NET_ALAMO)
 	else if (linked_shuttle.id == DROPSHIP_NORMANDY)
 		deployed_turret.linked_cam.network = list(CAMERA_NET_NORMANDY)
-
+	else if(linked_shuttle.id == DROPSHIP_MIDWAY)
+		deployed_turret.linked_cam.network = list(CAMERA_NET_MIDWAY)
 
 /obj/structure/dropship_equipment/sentry_holder/proc/undeploy_sentry()
 	if(!deployed_turret)

code/modules/dropships/attach_points/templates.dm

@@ -80,6 +80,47 @@
 	transverse  =  3
 	long    =  0
 
+/obj/effect/attach_point/weapon/midway
+	ship_tag = DROPSHIP_MIDWAY
+
+/obj/effect/attach_point/weapon/midway/left_wing
+	name = "port wing weapon attach point"
+	icon_state = "equip_base_l_wing"
+	attach_id = 1
+	dir = WEST
+	firing_arc_min = -3
+	firing_arc_max =  3
+	transverse  = -3
+	long    =  0
+
+/obj/effect/attach_point/weapon/midway/left_fore
+	name = "port fore weapon attach point"
+	attach_id = 2
+	dir = NORTH
+	firing_arc_min = -6
+	firing_arc_max =  0
+	transverse  =  0
+	long    =  0
+
+/obj/effect/attach_point/weapon/midway/right_fore
+	name = "starboard fore weapon attach point"
+	attach_id = 3
+	dir = NORTH
+	firing_arc_min =  0
+	firing_arc_max =  6
+	transverse  =  0
+	long    =  0
+
+/obj/effect/attach_point/weapon/midway/right_wing
+	name = "starboard wing weapon attach point"
+	icon_state = "equip_base_r_wing";
+	attach_id = 4
+	dir = EAST
+	firing_arc_min = -3
+	firing_arc_max =  3
+	transverse  =  3
+	long    =  0
+
 /obj/effect/attach_point/crew_weapon
 	name = "crew compartment attach point"
 	base_category = DROPSHIP_CREW_WEAPON
@@ -90,6 +131,9 @@
 /obj/effect/attach_point/crew_weapon/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
+/obj/effect/attach_point/crew_weapon/midway
+	ship_tag = DROPSHIP_MIDWAY
+
 /obj/effect/attach_point/electronics
 	name = "electronic system attach point"
 	base_category = DROPSHIP_ELECTRONICS
@@ -102,6 +146,9 @@
 /obj/effect/attach_point/electronics/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
+/obj/effect/attach_point/electronics/midway
+	ship_tag = DROPSHIP_MIDWAY
+
 /obj/effect/attach_point/fuel
 	name = "engine system attach point"
 	icon = 'icons/obj/structures/props/almayer_props64.dmi'
@@ -114,6 +161,9 @@
 /obj/effect/attach_point/fuel/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
+/obj/effect/attach_point/fuel/midway
+	ship_tag = DROPSHIP_MIDWAY
+
 /obj/effect/attach_point/computer
 	base_category = DROPSHIP_COMPUTER
 
@@ -122,3 +172,6 @@
 
 /obj/effect/attach_point/computer/dropship2
 	ship_tag = DROPSHIP_NORMANDY
+
+/obj/effect/attach_point/computer/midway
+	ship_tag = DROPSHIP_MIDWAY

code/modules/shuttle/shuttles/dropship.dm

@@ -104,6 +104,15 @@
 			set_security_level(SEC_LEVEL_RED)
 			return
 
+/obj/docking_port/mobile/marine_dropship/midway
+	name = "Midway"
+	id = DROPSHIP_MIDWAY
+	width = 9
+	height = 18
+
+	dwidth = 4
+	dheight = 8
+
 /obj/docking_port/mobile/marine_dropship/alamo
 	name = "Alamo"
 	id = DROPSHIP_ALAMO
@@ -260,6 +269,12 @@
 	auto_open = TRUE
 	roundstart_template = /datum/map_template/shuttle/normandy
 
+/obj/docking_port/stationary/marine_dropship/golden_arrow_hangar
+	name = "Hangar Bay"
+	id = GOLDEN_ARROW_LZ
+	auto_open = TRUE
+	roundstart_template = /datum/map_template/shuttle/midway
+
 /obj/docking_port/stationary/marine_dropship/crash_site
 	auto_open = TRUE
 
@@ -285,6 +300,10 @@
 
 	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING)
 
+/datum/map_template/shuttle/midway
+	name = "Midway"
+	shuttle_id = DROPSHIP_MIDWAY
+
 /datum/map_template/shuttle/alamo
 	name = "Alamo"
 	shuttle_id = DROPSHIP_ALAMO