Merge pull request #3612 from CHOMPStation2/upstream-merge-11763

[MIRROR] Talon Improvements, Take 2

code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm

@@ -1444,6 +1444,13 @@
 		"stripes" = COLOR_OFF_WHITE,
 		"glass" = COLOR_WHITE
 	)
+	
+/decl/closet_appearance/wall_double/survival
+	color = COLOR_CYAN_BLUE
+	decals = null
+	extra_decals = list(
+		"stripe_outer" = COLOR_WHITE
+	)
 
 // Carts
 /decl/closet_appearance/cart

code/game/objects/structures/crates_lockers/closets/walllocker.dm

@@ -183,3 +183,44 @@
 /obj/structure/closet/walllocker_double/hydrant/east
 	pixel_x = 32
 	dir = EAST
+
+/obj/structure/closet/walllocker_double/survival
+	desc = "A wall mounted storage cabinet. It contains a small amount of emergency supplies for wilderness survival, but they probably won't last very long."
+	name = "Emergency Survival Wall Cabinet"
+	icon = 'icons/obj/closets/bases/wall_double.dmi'
+	closet_appearance = /decl/closet_appearance/wall_double/survival
+	density = FALSE
+	anchored = TRUE
+	store_mobs = 0
+	wall_mounted = 1
+	plane = TURF_PLANE
+	layer = ABOVE_TURF_LAYER
+
+	starts_with = list(
+		/obj/item/clothing/suit/space/emergency,
+		/obj/item/clothing/head/helmet/space/emergency,
+		/obj/item/clothing/mask/breath,
+		/obj/item/weapon/tank/oxygen,
+		/obj/item/device/suit_cooling_unit/emergency,
+		/obj/item/device/gps,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/random/mre,
+		/obj/item/device/flashlight/color/yellow,
+		/obj/item/device/flashlight/flare,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle)
+
+/obj/structure/closet/walllocker_double/survival/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/survival/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/survival/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/survival/east
+	pixel_x = 32
+	dir = EAST

maps/offmap_vr/talon/talon_v2.dm

@@ -47,7 +47,7 @@ var/global/list/latejoin_talon = list()
 	vessel_mass = 10000
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("talon_v2_near_fore_port", "talon_v2_near_fore_star", "talon_v2_near_aft_port", "talon_v2_near_aft_star", "talon_v2_wing_port", "talon_v2_wing_star")
-	initial_restricted_waypoints = list("Talon's Shuttle" = list("offmap_spawn_talonboat"))
+	initial_restricted_waypoints = list("Talon's Shuttle" = list("offmap_spawn_talonboat"), "Talon's Escape Pod" = list("offmap_spawn_talonpod"))
 
 	skybox_icon = 'talon.dmi'
 	skybox_icon_state = "skybox"
@@ -55,7 +55,7 @@ var/global/list/latejoin_talon = list()
 	skybox_pixel_y = 60
 
 	levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT)
-	unowned_areas = list(/area/shuttle/talonboat)
+	unowned_areas = list(/area/shuttle/talonboat,/area/shuttle/talonpod)
 
 // The shuttle's 'shuttle' computer
 /obj/machinery/computer/shuttle_control/explore/talonboat
@@ -70,6 +70,8 @@ var/global/list/latejoin_talon = list()
 	vessel_size = SHIP_SIZE_TINY
 	shuttle = "Talon's Shuttle"
 
+	levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT)
+
 // A shuttle lateloader landmark
 /obj/effect/shuttle_landmark/shuttle_initializer/talonboat
 	name = "Talon's shuttle bay"
@@ -94,6 +96,49 @@ var/global/list/latejoin_talon = list()
 	icon = 'icons/turf/areas_vr_talon.dmi'
 	icon_state = "green"
 
+
+///////////////////////////
+//// The Escape Pod
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/talon_escape
+	name = "shuttle control console"
+	shuttle_tag = "Talon's Escape Pod"
+	req_one_access = list(access_talon)
+
+/obj/effect/overmap/visitable/ship/landable/talon_pod
+	name = "ITV Talon Escape Pod"
+	desc = "An emergency escape pod from the ITV Talon."
+	vessel_mass = 500
+	vessel_size = SHIP_SIZE_TINY
+	shuttle = "Talon's Escape Pod"
+
+	levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT)
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/talonpod
+	name = "Talon's pod bay"
+	base_area = /area/talon_v2/pod_hangar
+	base_turf = /turf/simulated/floor/reinforced
+	landmark_tag = "offmap_spawn_talonpod"
+	docking_controller = "talon_podbay"
+	shuttle_type = /datum/shuttle/autodock/overmap/talonpod
+
+// The talon's boat
+/datum/shuttle/autodock/overmap/talonpod
+	name = "Talon's Escape Pod"
+	current_location = "offmap_spawn_talonpod"
+	docking_controller_tag = "talonpod_docker"
+	shuttle_area = /area/shuttle/talonpod
+	fuel_consumption = 1
+	defer_initialisation = TRUE
+
+/area/shuttle/talonpod
+	name = "Talon's Escape Pod"
+	requires_power = 1
+	icon = 'icons/turf/areas_vr_talon.dmi'
+	icon_state = "green"
+
 ///////////////////////////
 //// The Various Machines
 /obj/machinery/telecomms/allinone/talon
@@ -193,6 +238,37 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k
 >>>>>>> 6f0e8e5ffb... Merge pull request #10350 from KillianKirilenko/kk-ships
 <i>Harry Townes</i>"}
 
+/obj/item/weapon/paper/talon_cannon
+	name = "ITV Talon OFD Console"
+	info = {"to whoever's got the itchiest trigger finger,<br>\
+as a reward for recent good performance, the lads upstairs have seen fit to have our ship retrofitted with an Obstruction Field Disperser. This fancy bit of hardware can be used to, well, 'disperse' 'obstructions'. asteroids or carp shoals in the way? no problem! load her up and fire! range is pretty short though.<br>\
+<br>\
+they haven't issued very much ammo for it, so if you want more you'll have to trade with those nanotrasen boys and girls. use the blue ones for ion storms and electrical clouds, and the red ones for asteroids and carp. calibration and aiming the thing is a bit of a pain but you'll figure it out. pre-calibrate then mess with the numbers until accuracy hits 100%.<br>\
+<br>\
+aside from that, only thing you really need to keep in mind is that it'll explode pretty spectacularly if you try to fire it whilst it's cooling down *or* if the hatch is closed. hatch is rigged to the bridge shutter controls.<br>\
+<br>\
+oh, and it's not a weapon. don't try to shoot other ships with it or anything, it won't work.<br>\
+<br>\
+<i>Harry Townes</i>"}
+
+/obj/item/weapon/paper/talon_escape_pod
+	name = "ITV Talon Escape Pod"
+	info = {"to whoever's stuck bailing out,<br>\
+after some extensive retrofits to comply with starfaring vessel regulations, our lovely little ship has been outfitted with a proper escape pod, which you are now standing in if you are reading this paper! congratulations!<br>\
+<br>\
+in the untimely event that you actually need to use it and survive long enough to, here's what you need to know;<br>\
+1. the thrusters don't have enough power to really fly around in space very much.<br>\
+2. you probably don't have very much air either.<br>\
+3. on the plus side, plenty of seats and supplies.<br>\
+4. remember to hit the emergency distress signal button.<br>\
+5. you have no sensors, so I hope you wrote down or remember what's around.<br>\
+<br>\
+if you have to punch out, do it whilst the ship is in open space. the pod has <b><u>nothing</u></b> to stop space debris ventilating it! it is rated for reentry though, so if you can bail over a planet it should be able to take you down to a safe landing spot. from there, use the emergency supplies and try to hold out until rescue comes.<br>\
+<br>\
+personally I recommend using the ship's boat if you need to evacuate, but if you're stuck with the pod then... good luck!<br>\
+<br>\
+<i>Harry Townes</i>"}
+
 //Prevents remote control of drones
 /obj/machinery/drone_fabricator/talon
 	name = "somewhat glitchy drone fabricator"

maps/offmap_vr/talon/talon_v2_areas.dm

@@ -50,6 +50,9 @@
 /area/talon_v2/hangar
 	name = "\improper Talon - Hangar"
 	icon_state = "red"
+/area/talon_v2/pod_hangar
+	name = "\improper Talon - Pod Hangar"
+	icon_state = "red"
 
 /area/talon_v2/engineering
 	name = "\improper Talon - Engineering"
@@ -90,6 +93,9 @@
 /area/talon_v2/secure_storage
 	name = "\improper Talon - Secure Storage"
 	icon_state = "red"
+/area/talon_v2/ofd_ops
+	name = "\improper Talon - OFD Ops"
+	icon_state = "red"
 /area/talon_v2/bridge
 	name = "\improper Talon - Bridge"
 	icon_state = "blue"