done?

Author: Lexanx

code/modules/shuttles/escape_pods.dm

@@ -163,10 +163,10 @@ var/global/list/escape_pods_by_name = list()
 		var/command = href_list["command"]
 		if(command == "manual_arm")
 			pod.arming_controller.arm()
+			pod.get_possible_destination()
 			return TOPIC_REFRESH
 
 		if(command == "force_launch")
-			pod.get_possible_destination()
 			if (pod.can_launch())
 				pod.toggle_bds()
 				pod.launch(src)

maps/sierra/sierra_shuttles.dm

@@ -18,6 +18,11 @@
 	name = "Escaped"
 
 //Pods
+
+/area/shuttle/escape_pod
+	name = "Escape Pod"
+	base_turf = /turf/simulated/floor/plating
+
 #define SIERRA_ESCAPE_POD(NUMBER) \
 /datum/shuttle/autodock/ferry/escape_pod/sierrapod/escape_pod##NUMBER { \
 	shuttle_area = /area/shuttle/escape_pod/escape_pod##NUMBER/station; \

maps/sierra/z1-z4_sierra.dmm

@@ -67,7 +67,7 @@
 	build_path = /obj/item/ammo_magazine/pistol/double
 
 /datum/design/autolathe/arms_ammo/hidden/magazine_pistol_double_rubber
-	name = "ammunition (pistol doublestack. rubber)"
+	name = "ammunition (pistol doublestack rubber)"
 	build_path = /obj/item/ammo_magazine/pistol/double/rubber
 
 /datum/design/autolathe/arms_ammo/hidden/magazine_small

mods/RnD/code/designs_autolathe/designs_arms_ammo.dm

@@ -481,7 +481,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 					))
 
 				// This calculates how much research points we missed because we already researched items with such orig_tech levels
-				var/tech_points_mod = files.experiments.get_object_research_value(linked_destroy.loaded_item) / files.experiments.get_object_research_value(linked_destroy.loaded_item, ignoreRepeat = TRUE)
+				var/tech_points_mod = files.experiments.get_object_research_value(linked_destroy.loaded_item) / (1 + files.experiments.get_object_research_value(linked_destroy.loaded_item, ignoreRepeat = TRUE))
 
 				var/list/destroy_list = list(
 					"has_item" =              TRUE,

mods/RnD/code/machinery/rdconsole.dm

@@ -32,6 +32,9 @@
 	icon_state = pick("yellow", "blue", "green", "red", "purple", "black")
 	max_capacity = 128
 
+/obj/item/stock_parts/computer/hard_drive/portable/design/printable/install_default_programs()
+	return
+
 
 /obj/item/stock_parts/computer/hard_drive/portable/LateInitialize(mapload)
 	install_default_programs()

mods/RnD/code/misc.dm

@@ -16,6 +16,8 @@
 
 
 /datum/artifact_effect/swap/proc/swap(mob/user)
+	if(!user)
+		return
 	if(world.time - last_swap > cooldown)
 		last_swap = world.time
 		var/weakness = GetAnomalySusceptibility(user)

mods/RnD/code/xenoarch/swap.dm

@@ -37,16 +37,22 @@
 	SIGNAL_HANDLER
 	for(var/A in turfs)
 		var/turf/T = get_turf(A)
-		if(prob(50)) // 50% chance to explode
-			explosion(T, rand(1, 5))
+		if(istype(T, /turf/simulated/wall))
+			if(prob(70))
+				T.damage_health(rand(100, 300), DAMAGE_BRUTE) // 70% chance to damage wall on collision
+		if(prob(40)) // 40% chance to explode
+			explosion(T, rand(1, 4))
+
 
 ///////////////////////////////////////////////////////
-/area/shuttle/escape_pod
-	name = "Escape Pod"
-	base_turf = /turf/simulated/floor/plating
 
 /obj/shuttle_landmark/escape_pod/out
 	name = "Escape Pod Landing Site"
+	base_turf = /turf/simulated/floor/plating
+
+/obj/shuttle_landmark/escape_pod/out/New()
+	.=..()
+	landmark_tag = "Nav_[name] - [rand(1, 1000)]"
 
 
 //////////////////////////ESCAPE POD////////////////////////////
@@ -74,15 +80,20 @@
 	var/obj/shuttle_landmark/escape_pod/out/escape_pod_landmark
 
 /datum/shuttle/autodock/ferry/escape_pod
-	move_time = 30 SECONDS
 	var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/pod_controller
+	var/destination_chosen
 
 /datum/shuttle/autodock/ferry/escape_pod/New()
 	.=..()
 	var/datum/computer/file/embedded_program/docking/simple/prog = SSshuttle.docking_registry[dock_target]
 	pod_controller = prog.master
 
+
 /datum/shuttle/autodock/ferry/escape_pod/proc/get_possible_destination()
+	if(destination_chosen)
+		return
+	if(current_location != waypoint_station)
+		return
 	var/list/possible_visits
 	var/obj/overmap/visitable/we = map_sectors["[pod_controller.z]"]
 	if(!we)
@@ -102,6 +113,8 @@
 		escape_pod_landmark = new (mark, src)
 		escape_pod_landmark.landmark_tag = "nav_[name] - site"
 		next_location = escape_pod_landmark
+	if(!mark)
+		next_location = waypoint_offsite
 
 /obj/shuttle_landmark/shuttle_arrived(datum/shuttle/shuttle)
 	if(istype(shuttle, /datum/shuttle/autodock/ferry/escape_pod))
@@ -110,3 +123,69 @@
 			if(shuttle.current_location == pod.escape_pod_landmark)
 				SEND_SIGNAL(src, COMSIG_POD_LANDED, explosion_locations)
 	return
+
+
+
+/obj/machinery/computer/pod_set_destination
+	name = "Escape Pod Navigation Computer"
+	desc = "A computer terminal used to set the destination of the escape pod."
+	icon_state = "tele_nav"
+	density = FALSE
+
+	var/list/possible_visits
+	var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/linked
+
+/obj/machinery/computer/pod_set_destination/New()
+	.=..()
+	if(!linked)
+		for(var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/A in range(2, src))
+			linked = A
+			break
+
+/obj/machinery/computer/pod_set_destination/Destroy()
+	if (linked)
+		linked = null
+	. = ..()
+
+/obj/machinery/computer/pod_set_destination/Click()
+	. = ..()
+	if(!linked)
+		for(var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/A in range(2, src))
+			linked = A
+		if(!linked)
+			to_chat(usr, SPAN_WARNING("No escape pod controller found nearby."))
+			return
+	else
+		get_possible_destinations()
+
+/obj/machinery/computer/pod_set_destination/proc/get_possible_destinations()
+	if(linked.pod.current_location != linked.pod.waypoint_station)
+		state("Pod is not docked, cannot set destination.")
+		return
+	possible_visits = list()
+	var/obj/overmap/visitable/destination_pod
+	var/obj/overmap/visitable/we = map_sectors["[src.z]"]
+	if(!we)
+		CRASH("Escape pod [name] could not find it's overmap sector!")
+	for(var/obj/overmap/visitable/visit in oview(we, 8))
+		if(visit == we)
+			continue
+		if(visit.map_z != we.map_z)
+			if(visit.map_z in possible_visits)
+				continue
+			possible_visits += visit
+	if(length(possible_visits))
+		destination_pod = input("Choose pod destination", "Pod Destination") as null|anything in possible_visits
+	else
+		linked.pod.next_location = linked.pod.waypoint_offsite
+		state("Pod destination set to outer space.")
+		return
+	var/x_destination = pick(rand(40, 160))
+	var/y_destination = pick(rand(40, 160))
+	var/z_destination = pick(destination_pod.map_z)
+	var/turf/mark = locate(x_destination, y_destination, z_destination)
+	if(mark)
+		linked.pod.escape_pod_landmark = new (mark, src)
+		linked.pod.next_location = linked.pod.escape_pod_landmark
+		linked.pod.destination_chosen = TRUE
+		state("Pod destination set to [destination_pod.name].")

mods/utility_items/code/shuttles/pods_landing.dm

@@ -22,7 +22,7 @@
 	. = ..()
 	plane = GAME_PLANE_ABOVE_FOV
 
-/obj/structure/bed/chair
+/obj/structure/bed
 	plane = GAME_PLANE_FOV_HIDDEN
 
 /obj/structure/curtain
@@ -33,3 +33,15 @@
 
 /obj/structure/iv_stand
 	plane = GAME_PLANE_FOV_HIDDEN
+
+/obj/aiming_overlay
+	plane = GAME_PLANE_FOV_HIDDEN
+
+/obj/fluid
+	plane = GAME_PLANE_FOV_HIDDEN
+
+/obj/machinery/light
+	plane = GAME_PLANE_FOV_HIDDEN
+
+/image/hud_overlay
+	plane = GAME_PLANE_FOV_HIDDEN