Landing pods (#3697)

Author: Lexanx

code/modules/shuttles/escape_pods.dm

@@ -104,7 +104,7 @@ var/global/list/escape_pods_by_name = list()
 /datum/shuttle/autodock/ferry/escape_pod/can_force()
 // [SIERRA-ADD]
 	if (arming_controller && arming_controller.master.emagged)	// inf
-		return (next_location && next_location.is_valid(src) && !current_location.cannot_depart(src) && moving_status == SHUTTLE_IDLE && !location && arming_controller && arming_controller.armed)	// inf
+		return (next_location && !current_location.cannot_depart(src) && moving_status == SHUTTLE_IDLE && !location && arming_controller && arming_controller.armed)	// inf
 	// [/SIERRA-ADD]
 	if (arming_controller.eject_time && world.time < arming_controller.eject_time + 50)
 		return 0	//dont allow force launching until 5 seconds after the arming controller has reached it's countdown

code/modules/shuttles/landmarks.dm

@@ -67,7 +67,6 @@
 /obj/shuttle_landmark/proc/sector_set(obj/overmap/visitable/O, shuttle_name)
 	shuttle_restricted = shuttle_name
 
-
 /obj/shuttle_landmark/proc/is_valid(datum/shuttle/shuttle)
 	if(shuttle.current_location == src)
 		return FALSE

maps/mapsystem/maps_unit_testing.dm

@@ -60,8 +60,9 @@
 		/area/meatstation,
 		/area/lost_supply_base,
 		/area/magshield,
+		/area/shuttle/escape_pod,
 		)
-		// /area/mine, /area/bluespaceriver, /area/lar_maria, /area/casino, /area/meatstation, /area/lost_supply_base, /area/magshield //[SIERRA-ADD]
+		// /area/mine, /area/bluespaceriver, /area/lar_maria, /area/casino, /area/meatstation, /area/lost_supply_base, /area/magshield, /area/shuttle/escape_pod //[SIERRA-ADD]
 
 	var/list/area_purity_test_exempt_areas = list()
 

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; \
@@ -33,10 +38,10 @@
 	docking_controller = "escape_pod_"+ #NUMBER +"_berth"; \
 } \
 /obj/shuttle_landmark/escape_pod/out/pod##NUMBER { \
-	landmark_tag = "escape_pod_"+ #NUMBER +"_internim"; \
+	landmark_tag = "escape_pod_"+ #NUMBER +"_out"; \
 } \
 /obj/shuttle_landmark/escape_pod/transit/pod##NUMBER { \
-	landmark_tag = "escape_pod_"+ #NUMBER +"_out"; \
+	landmark_tag = "escape_pod_"+ #NUMBER +"_internim"; \
 }
 
 SIERRA_ESCAPE_POD(1)

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

@@ -30,6 +30,9 @@
 /datum/design/autolathe/general/suit_cooler
 	build_path = /obj/item/device/suit_cooling_unit
 
+/datum/design/autolathe/general/suit_cooler_mini
+	build_path = /obj/item/device/suit_cooling_unit/miniature
+
 /datum/design/autolathe/general/weldermask
 	build_path = /obj/item/clothing/head/welding
 

mods/RnD/code/designs_autolathe/designs_general.dm

@@ -58,6 +58,7 @@
 		/datum/design/autolathe/general/radio_headset,
 		/datum/design/autolathe/general/radio_bounced,
 		/datum/design/autolathe/general/suit_cooler,
+		/datum/design/autolathe/general/suit_cooler_mini,
 		/datum/design/autolathe/general/weldermask,
 		/datum/design/autolathe/general/knife,
 		/datum/design/autolathe/general/taperecorder,

mods/RnD/code/designs_autolathe/disks.dm

@@ -103,6 +103,10 @@
 	update_icon()
 
 /obj/machinery/fabricator/Destroy()
+	for(var/material in stored_material)
+		var/material/M = SSmaterials.get_material_by_name(material)
+		if(stored_material[material] > M.units_per_sheet)
+			M.place_sheet(get_turf(src), round(stored_material[material] / M.units_per_sheet), M.name)
 	QDEL_NULL(wires)
 	return ..()
 
@@ -745,7 +749,7 @@
 /obj/machinery/fabricator/proc/consume_materials(datum/design/design)
 	for(var/material in design.materials)
 		var/material_cost = design.adjust_materials ? SANITIZE_LATHE_COST(design.materials[material]) : design.materials[material]
-		stored_material[material] = max(0, stored_material[material] - material_cost)
+		stored_material[material] = max(0, stored_material[material] - material_cost * mat_efficiency)
 
 	for(var/reagent in design.chemicals)
 		container.reagents.remove_reagent(reagent, design.chemicals[reagent])

mods/RnD/code/machinery/autolathe.dm

@@ -481,7 +481,12 @@ 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/denominator = files.experiments.get_object_research_value(linked_destroy.loaded_item, ignoreRepeat = TRUE)
+				var/tech_points_mod
+				if(denominator)
+					tech_points_mod = files.experiments.get_object_research_value(linked_destroy.loaded_item) / denominator
+				else
+					tech_points_mod = 1
 
 				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

@@ -23,3 +23,7 @@
 	if(airflow_suspended)
 		SSairflow.wake()
 		airflow_suspended = FALSE
+
+
+/area/shuttle/escape_pod
+	name = "Escape Pod"

mods/_master_files/code/modules/maps/map_template.dm

@@ -16,7 +16,7 @@
 
 	evac_prep_delay    = 0 MINUTES
 	evac_launch_delay  = 5 MINUTES
-	evac_transit_delay = 2 MINUTES
+	evac_transit_delay = 1 MINUTES
 
 	transfer_prep_additional_delay     = 20 MINUTES
 	autotransfer_prep_additional_delay = 10 MINUTES

mods/escpodinf/code/evacuation_pods_fast.dm

@@ -16,6 +16,7 @@
 #include "code/vox.dm"
 #include "code/simple.dm"
 #include "code/circuit.dm"
+#include "code/flashlight.dm"
 #include "code/global_hud_sierra.dm"
 #include "code/labcoat.dm"
 #include "code/shuttle_feature.dm"
@@ -24,7 +25,8 @@
 #include "code/ert_maint_helmet.dm"
 #include "code/tag_recipe.dm"
 #include "code/dodge_animation.dm"
-#include "code/advanced_landing.dm"
+#include "code/shuttles/advanced_landing.dm"
+#include "code/shuttles/pods_landing.dm"
 #include "code/languages.dm"
 #include "code/chemistry.dm"
 #include "code/jobs.dm"

mods/utility_items/_utility_items_includes.dm

@@ -0,0 +1,117 @@
+/obj/item/device/flashlight
+	var/suitable_cell = /obj/item/cell/device/standard
+	var/obj/item/cell/cell
+	var/power_cost = 0.2
+
+/obj/item/device/flashlight
+
+/obj/item/device/flashlight/lamp/floodlamp
+	power_cost = 1
+/obj/item/device/flashlight/lamp
+	power_cost = 0.2
+/obj/item/device/flashlight/lamp/lava
+	on = 1
+
+/obj/item/device/flashlight/upgraded
+	cell = /obj/item/cell/device/high
+/obj/item/device/flashlight/maglight
+	cell = /obj/item/cell/device/high
+/obj/item/device/flashlight/lantern
+	cell = /obj/item/cell/device/high//inf
+/obj/item/device/flashlight/drone
+	suitable_cell = null
+
+/obj/item/device/flashlight/flare
+	suitable_cell = null
+
+/obj/item/device/flashlight/Initialize()
+	. = ..()
+	if(!ispath(cell) && ispath(suitable_cell))
+		cell = new suitable_cell(src)
+	else if(ispath(cell))
+		suitable_cell = cell
+		cell = new cell()
+
+/obj/item/device/flashlight/get_cell()
+	return cell
+
+/obj/item/device/flashlight/proc/get_power_cost()
+	return abs(power_cost * flashlight_power / 2)
+
+/obj/item/device/flashlight/Process()
+	if(on && suitable_cell)
+		var/obj/item/cell/C = get_cell()
+		if(!C || !C.checked_use(get_power_cost()))
+			if(ismob(loc))
+				to_chat(loc, SPAN_WARNING("\The [src] dies. You are alone now."))
+			turn_off()
+		else
+			apply_power_deficiency()
+
+/obj/item/device/flashlight/proc/apply_power_deficiency()
+	var/obj/item/cell/C = get_cell()
+	if(!C)
+		return
+	if(flashlight_range > 0)
+		var/percent = C.percent()
+		var/min_range = 1
+		var/min_power = 0.1
+		var/range_out
+		var/power_out
+		if(percent >= 25)
+			range_out = flashlight_range
+			power_out = flashlight_power
+		else
+			var/k = percent / 25 // от 0 до 1
+			range_out = max(min_range, round(flashlight_range * k))
+			power_out = max(min_power, flashlight_power * k)
+		set_light(range_out, power_out)
+
+/obj/item/device/flashlight/set_flashlight()
+	if(on && cell && cell.charge > 1)
+		set_light(flashlight_range, flashlight_power)
+		START_PROCESSING(SSobj, src)
+	else if(on && !suitable_cell)
+		set_light(flashlight_range, flashlight_power)
+	else
+		turn_off()
+	update_icon()
+
+/obj/item/device/flashlight/proc/turn_off()
+	on = FALSE
+	set_light(0)
+	STOP_PROCESSING(SSobj, src)
+	update_icon()
+
+/obj/item/device/flashlight/MouseDrop(over_object)
+	if(istype(over_object, /obj/screen/inventory))
+		if(ismob(usr))
+			var/mob/user = usr
+			var/obj/screen/inventory/hand = over_object
+			if(!user.stat && hand.name && (loc == user) && eject_item_from(cell, user))
+				turn_off()
+				cell = null
+	else
+		return ..()
+
+/obj/item/device/flashlight/use_tool(obj/item/C, mob/living/user)
+	. = ..()
+	if(istype(C, suitable_cell) && !cell && insert_item_into(C, user))
+		cell = C
+
+
+/obj/proc/eject_item_from(obj/item/I, mob/living/user)
+	if(!I || !user.IsAdvancedToolUser())
+		return FALSE
+	user.put_in_hands(I)
+	playsound(src.loc, 'sound/weapons/guns/interaction/pistol_magin.ogg', 75, 1)
+	to_chat(user, SPAN_NOTICE("You remove \the [I] from \the [src]."))
+	return TRUE
+
+/obj/proc/insert_item_into(obj/item/I, mob/living/user)
+	if(!I || !user.unEquip(I))
+		return FALSE
+	I.forceMove(src)
+	playsound(src.loc, 'sound/weapons/guns/interaction/pistol_magout.ogg', 75, 1)
+	to_chat(user, SPAN_NOTICE("You insert \the [I] into \the [src]."))
+	return TRUE

mods/utility_items/code/flashlight.dm

@@ -313,12 +313,3 @@
 	.=..()
 	var/old_prev_type = prev_type
 	prev_type = old_prev_type
-
-
-/datum/shuttle/autodock/process_launch()
-	.=..()
-	for(var/i in 1 to LAZYLEN(next_location.image_shadow))
-		var/image/I = next_location.image_shadow[i]
-		var/turf/T = locate(I.loc.x, I.loc.y, I.loc.z)
-		I = image('mods/utility_items/icons/alphacolors.dmi', T, "dither50")
-		T.AddOverlays(I)