cmss13-devs · harryob · Aug 22, 2024 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024
diff --git a/code/__DEFINES/camera.dm b/code/__DEFINES/camera.dm
@@ -6,6 +6,7 @@
 #define CAMERA_NET_BRIG "Brig"
 #define CAMERA_NET_ALAMO "Alamo"
 #define CAMERA_NET_NORMANDY "Normandy"
+#define CAMERA_NET_SAIPAN "Saipan"
 #define CAMERA_NET_COLONY "Colony"
 #define CAMERA_NET_ARES "ARES"
 

diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
@@ -33,6 +33,7 @@
 #define RADIO_CHANNEL_MEDSCI "MedSci"
 #define RADIO_CHANNEL_MP "MP"
 #define RADIO_CHANNEL_NORMANDY "Normandy"
+#define RADIO_CHANNEL_SAIPAN "Saipan"
 #define RADIO_CHANNEL_REQ "Req"
 #define RADIO_CHANNEL_SENTRY "Sentry Network"
 #define RADIO_CHANNEL_SPECIAL "special"

diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
@@ -113,6 +113,7 @@
 
 #define DROPSHIP_ALAMO "dropship_alamo"
 #define DROPSHIP_NORMANDY "dropship_normandy"
+#define DROPSHIP_SAIPAN "dropship_saipan"
 
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"

diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
@@ -129,6 +129,7 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 
 #define DS1_FREQ 1488
 #define DS2_FREQ 1489
+#define DS3_FREQ 1490
 
 //Marine Squad channels
 #define ALPHA_FREQ 1491
@@ -176,6 +177,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 
 	RADIO_CHANNEL_ALAMO = DS1_FREQ,
 	RADIO_CHANNEL_NORMANDY = DS2_FREQ,
+	RADIO_CHANNEL_SAIPAN = DS3_FREQ,
 
 	RADIO_CHANNEL_COLONY = COLONY_FREQ,
 

diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm
@@ -115,7 +115,58 @@
 	icon_state = "away2"
 
 
+/area/shuttle/drop2/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
+/area/shuttle/drop3
+	//soundscape_playlist = list('sound/soundscape/drum1.ogg')
+	soundscape_interval = 30 //seconds
+	is_resin_allowed = FALSE
+	flags_area = AREA_NOTUNNEL
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+	base_lighting_alpha = 0
+
+/area/shuttle/drop3/sulaco
+	name = "\improper Dropship Saipan"
+	icon_state = "shuttle"
+	base_muffle = MUFFLE_HIGH
+	base_lighting_alpha = 255
+
+/area/shuttle/drop3/LV624
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_LV624
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/prison
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_PRISON
+	icon_state = "shuttle2"
 
+/area/shuttle/drop3/BigRed
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_BIGRED
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/ice_colony
+	name = "\improper Dropship Saipan"
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/DesertDam
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_TRIJENT
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/transit
+	ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg'
+	name = "\improper Dropship Saipan Transit"
+	icon_state = "shuttlered"
+
+/area/shuttle/drop3/lz3
+	name = "\improper Saipan Landing Zone"
+	icon_state = "away2"
 
 
 //DISTRESS SHUTTLES

diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
@@ -79,6 +79,9 @@
 /obj/structure/machinery/camera/autoname/almayer/dropship_two
 	network = list(CAMERA_NET_ALMAYER, CAMERA_NET_NORMANDY)
 
+/obj/structure/machinery/camera/autoname/almayer/dropship_three
+	network = list(CAMERA_NET_ALMAYER, CAMERA_NET_RESEARCH)
+
 /obj/structure/machinery/camera/autoname/almayer
 	name = "military-grade camera"
 	network = list(CAMERA_NET_ALMAYER)

diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
@@ -392,4 +392,8 @@
 	name = "\improper 'Normandy' camera controls"
 	network = list(CAMERA_NET_NORMANDY, CAMERA_NET_LASER_TARGETS)
 
+/obj/structure/machinery/computer/cameras/dropship/three
+	name = "\improper 'Saipan' camera controls"
+	network = list(CAMERA_NET_RESEARCH, CAMERA_NET_LASER_TARGETS)
+
 #undef DEFAULT_MAP_SIZE
@@ -890,6 +890,12 @@
 	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
 	shuttle_tag = DROPSHIP_NORMANDY
 
+/obj/structure/machinery/computer/dropship_weapons/dropship3
+	name = "\improper 'Saipan' weapons controls"
+	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
+	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
+	shuttle_tag = DROPSHIP_SAIPAN
+
 /obj/structure/machinery/computer/dropship_weapons/Destroy()
 	. = ..()
 	QDEL_NULL(firemission_envelope)

diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
@@ -901,6 +901,9 @@
 /obj/structure/machinery/door/airlock/hatch/cockpit/two
 	icon = 'icons/obj/structures/doors/dropship2_pilot.dmi'
 
+/obj/structure/machinery/door/airlock/hatch/cockpit/three
+	icon = 'icons/obj/structures/doors/dropship3_pilot.dmi'
+
 //PRISON AIRLOCKS
 /obj/structure/machinery/door/airlock/prison
 	name = "cell Door"

diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
@@ -329,6 +329,10 @@
 	name = "\improper Normandy cargo door"
 	icon = 'icons/obj/structures/doors/dropship2_cargo.dmi'
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds3
+	name = "\improper Saipan cargo door"
+	icon = 'icons/obj/structures/doors/dropship3_cargo.dmi'
+
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside
 	width = 2
 
@@ -340,6 +344,10 @@
 	name = "\improper Normandy crew hatch"
 	icon = 'icons/obj/structures/doors/dropship2_side2.dmi'
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds3
+	name = "\improper Saipan crew hatch"
+	icon = 'icons/obj/structures/doors/dropship3_side2.dmi'
+
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/blastdoor
 	name = "bulkhead blast door"
 	icon = 'icons/obj/structures/doors/almayerblastdoor.dmi'

diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
@@ -81,3 +81,7 @@
 /obj/item/device/radio/intercom/normandy
 	name = "dropship normandy intercom"
 	frequency = DS2_FREQ
+
+/obj/item/device/radio/intercom/saipan
+	name = "dropship saipan intercom"
+	frequency = DS3_FREQ
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
@@ -282,11 +282,18 @@
 /turf/closed/shuttle/twe_dropship/transparent
 	opacity = FALSE
 
-/turf/closed/shuttle/dropship2/tornado
-	name = "\improper Tornado"
+/turf/closed/shuttle/dropship3
+	name = "\improper Saipan"
 	icon = 'icons/turf/dropship3.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/dropship3/transparent
+	opacity = FALSE
+
+/turf/closed/shuttle/dropship3/tornado
+	name = "\improper Tornado"
 
-/turf/closed/shuttle/dropship2/tornado/typhoon
+/turf/closed/shuttle/dropship3/tornado/typhoon
 	name = "\improper Typhoon"
 
 /turf/closed/shuttle/escapepod

diff --git a/code/game/turfs/transit.dm b/code/game/turfs/transit.dm
@@ -264,6 +264,10 @@
 	shuttle_tag = DROPSHIP_NORMANDY
 	dir = SOUTH
 
+/turf/open/space/transit/dropship/saipan
+	shuttle_tag = DROPSHIP_SAIPAN
+	dir = SOUTH
+
 /turf/open/space/transit/south
 	dir = SOUTH
 

diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm
@@ -288,6 +288,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_SAIPAN)
+		deployed_turret.linked_cam.network = list(CAMERA_NET_SAIPAN)
 
 
 /obj/structure/dropship_equipment/sentry_holder/proc/undeploy_sentry()

diff --git a/code/modules/dropships/attach_points/templates.dm b/code/modules/dropships/attach_points/templates.dm
@@ -80,6 +80,47 @@
 	transverse  =  3
 	long    =  0
 
+/obj/effect/attach_point/weapon/dropship3
+	ship_tag = DROPSHIP_SAIPAN
+
+/obj/effect/attach_point/weapon/dropship3/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/dropship3/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/dropship3/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/dropship3/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
@@ -96,6 +137,12 @@
 /obj/effect/attach_point/crew_weapon/dropship2/floor
 	plane = FLOOR_PLANE
 
+/obj/effect/attach_point/crew_weapon/dropship3
+	ship_tag = DROPSHIP_SAIPAN
+
+/obj/effect/attach_point/crew_weapon/dropship3/floor
+	plane = FLOOR_PLANE
+
 /obj/effect/attach_point/electronics
 	name = "electronic system attach point"
 	base_category = DROPSHIP_ELECTRONICS
@@ -108,6 +155,9 @@
 /obj/effect/attach_point/electronics/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
+/obj/effect/attach_point/electronics/dropship3
+	ship_tag = DROPSHIP_SAIPAN
+
 /obj/effect/attach_point/fuel
 	name = "engine system attach point"
 	icon = 'icons/obj/structures/props/almayer_props64.dmi'
@@ -120,6 +170,10 @@
 /obj/effect/attach_point/fuel/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
+/obj/effect/attach_point/fuel/dropship3
+	ship_tag = DROPSHIP_SAIPAN
+
+
 /obj/effect/attach_point/computer
 	base_category = DROPSHIP_COMPUTER
 
@@ -128,3 +182,6 @@
 
 /obj/effect/attach_point/computer/dropship2
 	ship_tag = DROPSHIP_NORMANDY
+
+/obj/effect/attach_point/computer/dropship3
+	ship_tag = DROPSHIP_SAIPAN
diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -798,6 +798,8 @@
 		var/ship_id = "sh_dropship1"
 		if(shuttle_tag == DROPSHIP_NORMANDY)
 			ship_id = "sh_dropship2"
+		if(shuttle_tag == DROPSHIP_SAIPAN)
+			ship_id = "sh_dropship3"
 
 		for(var/obj/structure/machinery/door/airlock/dropship_hatch/D in GLOB.machines)
 			if(D.id == ship_id)