UPP Dropship Morana & Devana | USCM DS3 Saipan Fix (#7466)

# About the pull request This PR adds two new UPP dropships to the game, the Morana & Devana. They are fully functional dropships intended for use by the UPP during admin events. They are linked to only be able to use UPP-aligned landing zones by default, this ensures only UPP personnel can control the craft. This can be changed by admins for events. Both dropships are almost identical outside of some sprite differences. This PR also fixes the Saipan to make it useable, as previously the ship was impossible to spawn. Many thanks to @Zenith00000 for the sprites. # Explain why it's good for the game This grants additional options for event runners to employ the use of the UPP without needing to use a USCM dropship that has been modified for use. # Testing Photographs and Procedure (Old rear-hatch sprite) ![Screenshot 2024-11-02 00 48 27](https://github.com/user-attachments/assets/d298ea13-11ef-4250-b488-08f8c634e31d) # Changelog :cl: Steelpoint, Zenith mapadd: Two UPP dropships have been added for event use, the Morana and the Devana. maptweak: Fixes a issue preventing the Saipan, a USCM dropship, from being spawned by admins for events. /:cl: --------- Co-authored-by: Steelpoint <[email protected]> Co-authored-by: harryob <[email protected]>
cmss13-devs · Nov 12, 2024 · 97ddfa7 · 97ddfa7
1 parent 5900c90
commit 97ddfa7
Show file tree

Hide file tree

Showing 24 changed files with 2,273 additions and 1 deletion.
diff --git a/code/__DEFINES/camera.dm b/code/__DEFINES/camera.dm
@@ -7,6 +7,8 @@
 #define CAMERA_NET_ALAMO "Alamo"
 #define CAMERA_NET_NORMANDY "Normandy"
 #define CAMERA_NET_SAIPAN "Saipan"
+#define CAMERA_NET_MORANA "Morana"
+#define CAMERA_NET_DEVANA "Devana"
 #define CAMERA_NET_COLONY "Colony"
 #define CAMERA_NET_ARES "ARES"
 

diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
@@ -114,10 +114,14 @@
 #define DROPSHIP_ALAMO "dropship_alamo"
 #define DROPSHIP_NORMANDY "dropship_normandy"
 #define DROPSHIP_SAIPAN "dropship_saipan"
+#define DROPSHIP_MORANA "dropship_morana"
+#define DROPSHIP_DEVANA "dropship_devana"
 
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"
 
+#define UPP_DROPSHIP_LZ2 "upp-hangar-lz1"
+
 #define DROPSHIP_FLYBY_ID "special_flight"
 #define DROPSHIP_LZ1 "dropship-lz1"
 #define DROPSHIP_LZ2 "dropship-lz2"

diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
@@ -93,6 +93,8 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define UPP_MED_FREQ 1254
 #define UPP_CCT_FREQ 1255
 #define UPP_KDO_FREQ 1259
+#define UPP_DS1_FREQ 1260
+#define UPP_DS2_FREQ 1261
 
 //CLF Channels (1270-1289)
 #define CLF_FREQ 1271
@@ -197,6 +199,8 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_UPP_MED = UPP_MED_FREQ,
 	RADIO_CHANNEL_UPP_CCT = UPP_CCT_FREQ,
 	RADIO_CHANNEL_UPP_KDO = UPP_KDO_FREQ,
+	RADIO_CHANNEL_UPP_MORANA = UPP_DS1_FREQ,
+	RADIO_CHANNEL_UPP_KOROLOV = UPP_DS2_FREQ,
 
 	RADIO_CHANNEL_CLF_GEN = CLF_FREQ,
 	RADIO_CHANNEL_CLF_CMD = CLF_CMD_FREQ,

diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm
@@ -168,6 +168,100 @@
 	name = "\improper Saipan Landing Zone"
 	icon_state = "away2"
 
+//UPP DROPSHIP
+
+/area/shuttle/drop_upp/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
+/area/shuttle/drop_upp
+	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/drop_upp/morana
+	name = "\improper Dropship Morana"
+	icon_state = "shuttle"
+	base_muffle = MUFFLE_HIGH
+	base_lighting_alpha = 255
+
+/area/shuttle/drop_upp/LV624
+	name = "\improper Dropship Morana"
+	ambience_exterior = AMBIENCE_LV624
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp/prison
+	name = "\improper Dropship Morana"
+	ambience_exterior = AMBIENCE_PRISON
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp/BigRed
+	name = "\improper Dropship Morana"
+	ambience_exterior = AMBIENCE_BIGRED
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp/ice_colony
+	name = "\improper Dropship Morana"
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp/DesertDam
+	name = "\improper Dropship Morana"
+	ambience_exterior = AMBIENCE_TRIJENT
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp/transit
+	ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg'
+	name = "\improper Dropship Morana Transit"
+	icon_state = "shuttlered"
+
+/area/shuttle/drop_upp/lz_upp
+	name = "\improper Morana Landing Zone"
+	icon_state = "away2"
+
+////
+
+/area/shuttle/drop_upp2/devana
+	name = "\improper Dropship Devana"
+	icon_state = "shuttle"
+	base_muffle = MUFFLE_HIGH
+	base_lighting_alpha = 255
+
+/area/shuttle/drop_upp2/LV624
+	name = "\improper Dropship Devana"
+	ambience_exterior = AMBIENCE_LV624
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp2/prison
+	name = "\improper Dropship Devana"
+	ambience_exterior = AMBIENCE_PRISON
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp2/BigRed
+	name = "\improper Dropship Devana"
+	ambience_exterior = AMBIENCE_BIGRED
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp2/ice_colony
+	name = "\improper Dropship Devana"
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp2/DesertDam
+	name = "\improper Dropship Devana"
+	ambience_exterior = AMBIENCE_TRIJENT
+	icon_state = "shuttle2"
+
+/area/shuttle/drop_upp2/transit
+	ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg'
+	name = "\improper Dropship Devana Transit"
+	icon_state = "shuttlered"
+
+/area/shuttle/drop_upp2/lz_upp
+	name = "\improper Devana Landing Zone"
+	icon_state = "away2"
 
 //DISTRESS SHUTTLES
 

diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
@@ -904,6 +904,9 @@
 /obj/structure/machinery/door/airlock/hatch/cockpit/three
 	icon = 'icons/obj/structures/doors/dropship3_pilot.dmi'
 
+/obj/structure/machinery/door/airlock/hatch/cockpit/upp
+	icon = 'icons/obj/structures/doors/dropship_upp_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
@@ -333,6 +333,14 @@
 	name = "\improper Saipan cargo door"
 	icon = 'icons/obj/structures/doors/dropship3_cargo.dmi'
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp
+	name = "\improper Morana cargo door"
+	icon = 'icons/obj/structures/doors/dropship_upp_cargo.dmi'
+
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp2
+	name = "\improper Devana cargo door"
+	icon = 'icons/obj/structures/doors/dropship_upp_cargo.dmi'
+
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside
 	width = 2
 
@@ -348,6 +356,14 @@
 	name = "\improper Saipan crew hatch"
 	icon = 'icons/obj/structures/doors/dropship3_side2.dmi'
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp
+	name = "\improper Morana crew hatch"
+	icon = 'icons/obj/structures/doors/dropship_upp_side2.dmi'
+
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp2
+	name = "\improper Devana crew hatch"
+	icon = 'icons/obj/structures/doors/dropship_upp_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
@@ -85,3 +85,11 @@
 /obj/item/device/radio/intercom/saipan
 	name = "dropship saipan intercom"
 	frequency = DS3_FREQ
+
+/obj/item/device/radio/intercom/morana
+	name = "dropship morana intercom"
+	frequency = UPP_DS1_FREQ
+
+/obj/item/device/radio/intercom/devana
+	name = "dropship devana intercom"
+	frequency = UPP_DS2_FREQ
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
@@ -296,6 +296,22 @@
 /turf/closed/shuttle/dropship3/tornado/typhoon
 	name = "\improper Typhoon"
 
+/turf/closed/shuttle/upp_dropship
+	name = "\improper Morana"
+	icon = 'icons/turf/upp_dropship.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/upp_dropship/transparent
+	opacity = FALSE
+
+/turf/closed/shuttle/upp_dropship2
+	name = "\improper Devana"
+	icon = 'icons/turf/upp_dropship.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/upp_dropship2/transparent
+	opacity = FALSE
+
 /turf/closed/shuttle/escapepod
 	name = "wall"
 	icon = 'icons/turf/escapepods.dmi'

diff --git a/code/game/turfs/transit.dm b/code/game/turfs/transit.dm
@@ -268,6 +268,14 @@
 	shuttle_tag = DROPSHIP_SAIPAN
 	dir = SOUTH
 
+/turf/open/space/transit/dropship/morana
+	shuttle_tag = DROPSHIP_MORANA
+	dir = SOUTH
+
+/turf/open/space/transit/dropship/devana
+	shuttle_tag = DROPSHIP_DEVANA
+	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
@@ -297,6 +297,11 @@
 		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)
+	else if (linked_shuttle.id == DROPSHIP_MORANA)
+		deployed_turret.linked_cam.network = list(CAMERA_NET_MORANA)
+	else if (linked_shuttle.id == DROPSHIP_DEVANA)
+		deployed_turret.linked_cam.network = list(CAMERA_NET_DEVANA)
+
 
 
 /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
@@ -121,6 +121,88 @@
 	transverse  =  3
 	long    =  0
 
+/obj/effect/attach_point/weapon/dropship_upp
+	ship_tag = DROPSHIP_MORANA
+
+/obj/effect/attach_point/weapon/dropship_upp/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/dropship_upp/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/dropship_upp/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/dropship_upp/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/weapon/dropship_upp2
+	ship_tag = DROPSHIP_DEVANA
+
+/obj/effect/attach_point/weapon/dropship_upp2/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/dropship_upp2/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/dropship_upp2/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/dropship_upp2/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
@@ -143,6 +225,18 @@
 /obj/effect/attach_point/crew_weapon/dropship3/floor
 	plane = FLOOR_PLANE
 
+/obj/effect/attach_point/crew_weapon/dropship_upp
+	ship_tag = DROPSHIP_MORANA
+
+/obj/effect/attach_point/crew_weapon/dropship_upp/floor
+	plane = FLOOR_PLANE
+
+/obj/effect/attach_point/crew_weapon/dropship_upp2
+	ship_tag = DROPSHIP_DEVANA
+
+/obj/effect/attach_point/crew_weapon/dropship_upp2/floor
+	plane = FLOOR_PLANE
+
 /obj/effect/attach_point/electronics
 	name = "electronic system attach point"
 	base_category = DROPSHIP_ELECTRONICS
@@ -158,6 +252,12 @@
 /obj/effect/attach_point/electronics/dropship3
 	ship_tag = DROPSHIP_SAIPAN
 
+/obj/effect/attach_point/electronics/dropship_upp
+	ship_tag = DROPSHIP_MORANA
+
+/obj/effect/attach_point/electronics/dropship_upp2
+	ship_tag = DROPSHIP_DEVANA
+
 /obj/effect/attach_point/fuel
 	name = "engine system attach point"
 	icon = 'icons/obj/structures/props/dropship_equipment64.dmi'
@@ -173,6 +273,12 @@
 /obj/effect/attach_point/fuel/dropship3
 	ship_tag = DROPSHIP_SAIPAN
 
+/obj/effect/attach_point/fuel/dropship_upp
+	ship_tag = DROPSHIP_MORANA
+
+/obj/effect/attach_point/fuel/dropship_upp2
+	ship_tag = DROPSHIP_DEVANA
+
 
 /obj/effect/attach_point/computer
 	base_category = DROPSHIP_COMPUTER
@@ -185,3 +291,6 @@
 
 /obj/effect/attach_point/computer/dropship3
 	ship_tag = DROPSHIP_SAIPAN
+
+/obj/effect/attach_point/computer/dropship_upp
+	ship_tag = DROPSHIP_MORANA
diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -802,6 +802,11 @@
 			ship_id = "sh_dropship2"
 		if(shuttle_tag == DROPSHIP_SAIPAN)
 			ship_id = "sh_dropship3"
+		if(shuttle_tag == DROPSHIP_MORANA)
+			ship_id = "sh_dropship4"
+		if(shuttle_tag == DROPSHIP_DEVANA)
+			ship_id = "sh_dropship5"
+
 
 		for(var/obj/structure/machinery/door/airlock/dropship_hatch/D in GLOB.machines)
 			if(D.id == ship_id)