1

Author: Lexanx

maps/sierra/z1-z4_sierra.dmm

@@ -1269,7 +1269,7 @@
 "cvb" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/catwalk_plated,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/quartermaster/hangar)
 "cvc" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/floor_decal/industrial/warning,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/quartermaster/office/post)
 "cve" = (/obj/structure/bed/chair/wood/walnut{dir = 4},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/floor_decal/corner/beige/diagonal,/obj/floor_decal/corner/brown/diagonal{dir = 4},/obj/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/vacant/dormintories)
-"cvh" = (/obj/machinery/light{dir = 8},/obj/structure/table/reinforced,/obj/machinery/computer/pod_set_destination{pixel_x = -30},/turf/simulated/floor/tiled/steel_ridged,/area/shuttle/escape_pod/escape_pod5/station)
+"cvh" = (/obj/machinery/light{dir = 8},/obj/structure/table/reinforced,/obj/machinery/pod_set_destination{pixel_x = -30},/turf/simulated/floor/tiled/steel_ridged,/area/shuttle/escape_pod/escape_pod5/station)
 "cvi" = (/obj/structure/table/rack,/obj/floor_decal/corner/yellow/mono,/obj/floor_decal/industrial/outline/yellow,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/random/tool,/obj/random/tool,/obj/random/tool,/obj/item/flame/lighter/random,/turf/simulated/floor/tiled/monotile,/area/quartermaster/suplocker_room)
 "cvj" = (/turf/simulated/wall/r_wall/hull,/area/chapel/main)
 "cvH" = (/turf/simulated/floor/tiled/techmaint,/area/storage/tech)
@@ -1725,7 +1725,7 @@
 "dpq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/selfestructgrid,/area/security/nuke_storage)
 "dpz" = (/obj/floor_decal/borderfloorblack{dir = 10},/obj/floor_decal/corner/darkblue/border{dir = 10},/obj/floor_decal/spline/fancy/black/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/bridge/nano)
 "dpA" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/obj/floor_decal/corner/yellow{dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/hallway/primary/thirddeck/fore)
-"dpD" = (/obj/structure/bed/chair/shuttle/white{dir = 8},/obj/floor_decal/borderfloor{dir = 4},/obj/floor_decal/corner/grey/border{dir = 4},/obj/machinery/computer/pod_set_destination{pixel_x = 30},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod3/station)
+"dpD" = (/obj/structure/bed/chair/shuttle/white{dir = 8},/obj/floor_decal/borderfloor{dir = 4},/obj/floor_decal/corner/grey/border{dir = 4},/obj/machinery/pod_set_destination{pixel_x = 30},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod3/station)
 "dpK" = (/obj/machinery/door/blast/regular{dir = 8; id_tag = "armory_lethal"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/floor_decal/industrial/hatch/grey,/turf/simulated/floor/tiled/dark/monotile,/area/security/sierra/armory)
 "dpU" = (/obj/wallframe_spawn/reinforced/hull,/obj/machinery/door/firedoor,/obj/machinery/door/blast/regular{dir = 4; id_tag = "bridge_windows"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/bridge/nano)
 "dpX" = (/obj/floor_decal/borderfloorblack/corner{dir = 4},/obj/floor_decal/corner/darkblue/bordercorner{dir = 4},/obj/floor_decal/spline/fancy/black/corner{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/bridge/nano)
@@ -7250,7 +7250,7 @@
 "nVV" = (/obj/structure/table/woodentable/walnut,/obj/random/single/playing_cards,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/carpet,/area/crew_quarters/cafe/upper)
 "nVZ" = (/obj/structure/extinguisher_cabinet{pixel_x = 24; dir = 8},/obj/structure/closet/secure_closet/infotech_sierra,/obj/floor_decal/techfloor{dir = 4},/obj/floor_decal/techfloor{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/tcommsat/computer)
 "nWg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/table/standard,/obj/item/material/ashtray/glass,/turf/simulated/floor/tiled/dark,/area/security/sierra/forensic)
-"nWq" = (/obj/structure/bed/chair/shuttle/white{dir = 4},/obj/floor_decal/borderfloor{dir = 8},/obj/floor_decal/corner/grey/border{dir = 8},/obj/machinery/computer/pod_set_destination{pixel_x = -30; pixel_y = -4},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod2/station)
+"nWq" = (/obj/structure/bed/chair/shuttle/white{dir = 4},/obj/floor_decal/borderfloor{dir = 8},/obj/floor_decal/corner/grey/border{dir = 8},/obj/machinery/pod_set_destination{pixel_x = -30; pixel_y = -4},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod2/station)
 "nWx" = (/obj/machinery/shield_diffuser,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/floor_decal/corner/red/border,/turf/simulated/floor/reinforced{map_airless = 1},/area/space)
 "nWC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/rnd/research)
 "nWH" = (/obj/machinery/button/blast_door{id_tag = "ai_upload_blast"; name = "Cyborg Upload Blast Doors"; pixel_y = 24; req_access = list("ACCESS_AI_UPLOAD")},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/plating,/area/maintenance/thirddeck/forestarboard)
@@ -9615,7 +9615,7 @@
 "svO" = (/obj/machinery/computer/arcade,/turf/simulated/floor/plating,/area/maintenance/thirddeck/starboard)
 "swj" = (/obj/machinery/light/small/emergency{dir = 8},/turf/simulated/floor/reinforced,/area/vacant/monitoring)
 "swn" = (/obj/floor_decal/borderfloor{dir = 6},/obj/floor_decal/corner/yellow/border{dir = 6},/obj/floor_decal/borderfloor/corner2,/obj/floor_decal/corner/yellow/bordercorner2,/obj/machinery/vending/coffee{dir = 8},/obj/machinery/button/blast_door{id_tag = "qm_warehouse2"; name = "Warehouse Door Control"; pixel_y = -27; req_access = list("ACCESS_CARGO"); dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/fourthdeck/aft_stairwell)
-"swp" = (/obj/structure/bed/chair/shuttle/white{dir = 4},/obj/floor_decal/borderfloor{dir = 8},/obj/floor_decal/corner/grey/border{dir = 8},/obj/machinery/computer/pod_set_destination{pixel_x = -30},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod4/station)
+"swp" = (/obj/structure/bed/chair/shuttle/white{dir = 4},/obj/floor_decal/borderfloor{dir = 8},/obj/floor_decal/corner/grey/border{dir = 8},/obj/machinery/pod_set_destination{pixel_x = -30},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod4/station)
 "swy" = (/obj/machinery/hologram/holopad,/obj/floor_decal/techfloor{dir = 8},/obj/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/techfloor/grid,/area/crew_quarters/docking)
 "swA" = (/obj/floor_decal/corner/paleblue/border{dir = 8},/obj/floor_decal/corner/paleblue/bordercorner{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark/monotile,/area/medical/maintenance_equipstorage)
 "swD" = (/obj/floor_decal/industrial/outline/yellow,/obj/structure/bed/padded,/obj/item/bedsheet/green,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/bunk)
@@ -11042,7 +11042,7 @@
 "vfX" = (/obj/machinery/computer/rdservercontrol,/obj/machinery/requests_console{announcementConsole = 1; department = "Research Director"; departmentType = 3; name = "Research Director RC"; pixel_x = 32},/obj/machinery/light{dir = 1},/obj/floor_decal/borderfloorwhite{dir = 5},/obj/floor_decal/corner/purple/border{dir = 5},/obj/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/white/monotile,/area/crew_quarters/heads/office/rd)
 "vgf" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/turf/simulated/floor/wood/walnut,/area/crew_quarters/lounge)
 "vgi" = (/obj/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/mining,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/monotile,/area/quartermaster/expedition)
-"vgm" = (/obj/structure/bed/chair/shuttle/white{dir = 8},/obj/floor_decal/borderfloor{dir = 4},/obj/floor_decal/corner/grey/border{dir = 4},/obj/machinery/computer/pod_set_destination{pixel_x = 30; pixel_y = -4},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod1/station)
+"vgm" = (/obj/structure/bed/chair/shuttle/white{dir = 8},/obj/floor_decal/borderfloor{dir = 4},/obj/floor_decal/corner/grey/border{dir = 4},/obj/machinery/pod_set_destination{pixel_x = 30; pixel_y = -4},/turf/simulated/floor/tiled/steel_grid,/area/shuttle/escape_pod/escape_pod1/station)
 "vgG" = (/obj/wallframe_spawn/no_grille,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hydroponics)
 "vgR" = (/obj/structure/bed/chair/padded/black{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "vgS" = (/obj/floor_decal/industrial/danger{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/security/sierra/armory/lobby)

mods/RnD/code/designs_autolathe/designs_general.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/disks.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/utility_items/code/shuttles/advanced_landing.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)

mods/utility_items/code/shuttles/pods_landing.dm

@@ -64,7 +64,7 @@
 		return FALSE
 	for(var/area/A in shuttle.shuttle_area)
 		var/list/translation = get_turf_translation(get_turf(shuttle.current_location), get_turf(src), A.contents)
-		if(istype(A.type, /area/shuttle/escape_pod))
+		if(ispath(A.type, /area/shuttle/escape_pod))
 			var/list/turfs_explosive = get_turf_target_explosive(get_turf(shuttle.current_location), get_turf(src), A.contents)
 			if(LAZYLEN(turfs_explosive))
 				explosion_locations += turfs_explosive
@@ -127,28 +127,29 @@
 
 
 
-/obj/machinery/computer/pod_set_destination
+/obj/machinery/pod_set_destination
 	name = "Escape Pod Navigation Computer"
 	desc = "A computer terminal used to set the destination of the escape pod."
+	icon = 'icons/obj/machines/computer.dmi'
 	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()
+/obj/machinery/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()
+/obj/machinery/pod_set_destination/Destroy()
 	if (linked)
 		linked = null
 	. = ..()
 
-/obj/machinery/computer/pod_set_destination/Click()
+/obj/machinery/pod_set_destination/Click()
 	. = ..()
 	if(!linked)
 		for(var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/A in range(2, src))
@@ -159,7 +160,7 @@
 	else
 		get_possible_destinations()
 
-/obj/machinery/computer/pod_set_destination/proc/get_possible_destinations()
+/obj/machinery/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
@@ -193,8 +194,7 @@
 
 /obj/item/stock_parts/circuitboard/pod_set_destination
 	name = "circuit board (pod destination)"
-	build_path = /obj/machinery/computer/pod_set_destination
-	board_type = "computer"
+	build_path = /obj/machinery/pod_set_destination
 	origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1)
 
 /datum/design/circuit/pod_set_destination