From c51919edbe682982353b42658b16c6a946568760 Mon Sep 17 00:00:00 2001
From: LordNest <mishsaf@mail.ru>
Date: Mon, 26 Feb 2024 00:26:55 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D0=BD=D0=B5=D0=BC=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE,=20=D0=B4=D0=B0,=20=D1=80=D0=B0=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mods/_maps/hand/code/hand_crew.dm |  28 +-
 mods/_maps/hand/maps/hand-1.dmm   | 413 ++++++++++++++++++++++++------
 mods/_maps/hand/maps/hand-2.dmm   | 251 ++++++++++++++++--
 3 files changed, 578 insertions(+), 114 deletions(-)

diff --git a/mods/_maps/hand/code/hand_crew.dm b/mods/_maps/hand/code/hand_crew.dm
index 718f8f49bf808..3bbf0a95043e2 100644
--- a/mods/_maps/hand/code/hand_crew.dm
+++ b/mods/_maps/hand/code/hand_crew.dm
@@ -17,6 +17,12 @@
 /obj/submap_landmark/spawnpoint/away_hand/captain
 	name = "Corporate Vessel Captain"
 
+/obj/submap_landmark/spawnpoint/away_hand/captain/guardsman
+	name = "Frontier Alliance Guardsman"
+
+/obj/submap_landmark/spawnpoint/away_hand/captain/pilot
+	name = "Battlegroup Alpha Pilot"
+
 /obj/submap_landmark/spawnpoint/away_hand/surgeon
 	name = "Corporate Vessel Corpsman"
 
@@ -125,6 +131,14 @@ var/global/const/access_away_hand_captain = "ACCESS_HAND_CAPTAIN"
 	)
 	access = list(access_away_hand, access_away_hand_captain)
 
+/datum/job/submap/hand/captain/equip(mob/living/carbon/human/H)
+	if(H.mind.role_alt_title == "Frontier Alliance Guardsman")
+		outfit_type = /singleton/hierarchy/outfit/job/hand/captain/guardsman
+	if(H.mind.role_alt_title == "Battlegroup Alpha Pilot")
+		outfit_type = /singleton/hierarchy/outfit/job/hand/captain/pilot
+	return ..()
+
+
 /datum/job/submap/hand/surgeon
 	title = "Corporate Vessel Corpsman"
 	total_positions = 1
@@ -182,8 +196,9 @@ var/global/const/access_away_hand_captain = "ACCESS_HAND_CAPTAIN"
 	suit_store = /obj/item/tank/oxygen
 	id_types = list(/obj/item/card/id/hand)
 	id_slot = slot_wear_id
+	gloves = /obj/item/clothing/gloves/thick
 	pda_type = null
-	belt = null
+	belt = /obj/item/storage/belt/utility/full
 	back = /obj/item/storage/backpack/industrial
 	backpack_contents = null
 	flags = OUTFIT_EXTENDED_SURVIVAL
@@ -191,8 +206,9 @@ var/global/const/access_away_hand_captain = "ACCESS_HAND_CAPTAIN"
 /singleton/hierarchy/outfit/job/hand/captain
 	name = HAND_OUTFIT_JOB_NAME("Corporate Vessel Captain")
 	uniform = /obj/item/clothing/under/rank/adjutant
+	shoes = /obj/item/clothing/shoes/jackboots
 	id_types = list(/obj/item/card/id/hand/captain)
-	gloves = /obj/item/clothing/gloves/thick/combat
+	gloves = /obj/item/clothing/gloves/thick/duty
 	back = /obj/item/storage/backpack/rucksack
 	backpack_contents = null
 	flags = OUTFIT_EXTENDED_SURVIVAL
@@ -201,8 +217,9 @@ var/global/const/access_away_hand_captain = "ACCESS_HAND_CAPTAIN"
 	name = HAND_OUTFIT_JOB_NAME("Frontier Alliance Guardsman")
 	head = /obj/item/clothing/head/deckcrew
 	uniform = /obj/item/clothing/under/fa/vacsuit/hand/guardsman
+	shoes = /obj/item/clothing/shoes/jackboots
 	id_types = list(/obj/item/card/id/hand/captain)
-	gloves = /obj/item/clothing/gloves/thick/combat
+	gloves = /obj/item/clothing/gloves/thick/duty
 	back = /obj/item/storage/backpack/rucksack/blue
 	backpack_contents = null
 	flags = OUTFIT_EXTENDED_SURVIVAL
@@ -211,6 +228,7 @@ var/global/const/access_away_hand_captain = "ACCESS_HAND_CAPTAIN"
 	name = HAND_OUTFIT_JOB_NAME("Battlegroup Alpha Pilot")
 	head = /obj/item/clothing/head/solgov/utility/fleet
 	uniform = /obj/item/clothing/under/solgov/utility/fleet/command/pilot/fifth_fleet
+	shoes = /obj/item/clothing/shoes/jackboots
 	id_types = list(/obj/item/card/id/hand/captain/fifth_fleet)
 	belt = /obj/item/storage/belt/holster/security/tactical/away_solpatrol
 	gloves = /obj/item/clothing/gloves/thick/duty
@@ -221,7 +239,9 @@ var/global/const/access_away_hand_captain = "ACCESS_HAND_CAPTAIN"
 /singleton/hierarchy/outfit/job/hand/surgeon
 	name = HAND_OUTFIT_JOB_NAME("Corporate Vessel Corpsman")
 	uniform = /obj/item/clothing/under/solgov/utility/fleet/medical/hand
-	belt = /obj/item/storage/belt/holster/security/tactical/away_solpatrol
+	shoes = /obj/item/clothing/shoes/black
+	id_types = list(/obj/item/card/id/hand/medic)
+	belt = /obj/item/storage/belt/medical/emt
 	gloves = /obj/item/clothing/gloves/latex/nitrile
 	back = /obj/item/storage/backpack/satchel/med
 	backpack_contents = null
diff --git a/mods/_maps/hand/maps/hand-1.dmm b/mods/_maps/hand/maps/hand-1.dmm
index c39c6e7c87155..d33e3a43abfb9 100644
--- a/mods/_maps/hand/maps/hand-1.dmm
+++ b/mods/_maps/hand/maps/hand-1.dmm
@@ -31,7 +31,7 @@
 /area/ship/hand/shuttle/tug_one)
 "ai" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/vulcan{
-	id_tag = "carpod4_pump_out_scrubber";
+	id_tag = "handpodtwo_pump_out_scrubber";
 	power_rating = 15000;
 	scrubbing = "siphon";
 	dir = 8
@@ -229,6 +229,11 @@
 /obj/structure/table/rack,
 /obj/item/wheelchair_kit,
 /obj/floor_decal/industrial/outline/yellow,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = 8
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/cargo/maints)
 "bt" = (
@@ -247,6 +252,11 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/shuttle/pod_hand_two)
+"bB" = (
+/obj/item/cell/standard,
+/obj/item/clothing/glasses/meson,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/ship/hand/crew/miner_two)
 "bF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -438,6 +448,11 @@
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
 	id_tag = "handtugone_shuttle_pump_out_internal"
 	},
+/obj/machinery/airlock_sensor{
+	frequency = 1380;
+	id_tag = "handtugone_shuttle_sensor";
+	pixel_x = -23
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_one)
 "cK" = (
@@ -796,7 +811,8 @@
 	tag_airpump = "handtugone_port_dock_pump";
 	tag_exterior_door = "handtugone_port_dock_exterior_door";
 	tag_interior_door = "handtugone_port_dock_exterior_door";
-	tag_interior_sensor = "handtugone_port_dock_sensor_chamber"
+	tag_interior_sensor = "handtugone_port_dock_sensor_chamber";
+	frequency = 1380
 	},
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/miner_three)
@@ -868,7 +884,7 @@
 /obj/structure/railing/mapped,
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/vulcan{
 	dir = 1;
-	id_tag = "carpod4_pump_out_external"
+	id_tag = "handpodtwo_pump_out_external"
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/shuttle/pod_hand_two)
@@ -891,6 +907,11 @@
 "eB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = 6
+	},
 /turf/simulated/floor/lino,
 /area/ship/hand/command)
 "eC" = (
@@ -1177,6 +1198,11 @@
 	master_tag = "drone_engine";
 	pixel_y = 22
 	},
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/engineering/starboard)
 "fX" = (
@@ -1332,7 +1358,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_one)
 "gw" = (
 /obj/item/cell/standard,
@@ -1414,7 +1440,8 @@
 /area/ship/hand/command/bridge)
 "gR" = (
 /obj/machinery/door/airlock/external{
-	id_tag = "handtugtwo_shuttle_outer"
+	id_tag = "handtugtwo_shuttle_outer";
+	frequency = 1380
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
 	dir = 10
@@ -1605,6 +1632,9 @@
 /obj/floor_decal/industrial/danger{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/ship/hand/crew/hallway/lower/fore)
 "hO" = (
@@ -1899,7 +1929,9 @@
 /area/space)
 "jk" = (
 /obj/machinery/door/airlock/external{
-	id_tag = "drone_engine2_exterior_door"
+	id_tag = "drone_engine2_exterior_door";
+	locked = 1;
+	frequency = 1380
 	},
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -1946,7 +1978,8 @@
 /area/ship/hand/command/bridge)
 "jx" = (
 /obj/machinery/door/airlock/external{
-	id_tag = "handtugone_shuttle_inner"
+	id_tag = "handtugone_shuttle_inner";
+	frequency = 1380
 	},
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -1957,7 +1990,6 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/obj/shuttle_landmark/handtugone/start,
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_one)
 "jC" = (
@@ -2018,6 +2050,7 @@
 	id_tag = "handtugone_port_dock";
 	locked = 1
 	},
+/obj/shuttle_landmark/handtugone/start,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/miner_three)
 "jW" = (
@@ -2166,12 +2199,14 @@
 /area/ship/hand/crew/hallway/lower)
 "kL" = (
 /obj/machinery/power/solar_control{
-	dir = 4
+	dir = 4;
+	id_tag = "handsolarsport"
 	},
 /obj/structure/sign/warning/airlock{
 	dir = 4;
 	pixel_x = -32
 	},
+/obj/structure/cable/yellow,
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/engineering/port)
 "kP" = (
@@ -2347,7 +2382,8 @@
 /area/ship/hand/crew/miner_three)
 "ln" = (
 /obj/machinery/conveyor{
-	dir = 8
+	dir = 8;
+	id_tag = "hand"
 	},
 /obj/machinery/light,
 /turf/simulated/floor/tiled/steel_ridged,
@@ -2491,7 +2527,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/shuttle/pod_hand_two)
 "mi" = (
-/obj/machinery/power/solar,
+/obj/machinery/power/solar{
+	id_tag = "handsolarsport";
+	name = "Port Solar Array"
+	},
 /obj/structure/cable/yellow{
 	d2 = 8;
 	icon_state = "0-8"
@@ -2608,11 +2647,11 @@
 	},
 /obj/machinery/door/airlock/external/bolted_open{
 	frequency = 1431;
-	id_tag = "carpod4_outer"
+	id_tag = "handpodtwo_outer"
 	},
 /obj/machinery/airlock_sensor{
 	frequency = 1431;
-	id_tag = "carpod4_exterior_sensor";
+	id_tag = "handpodtwo_exterior_sensor";
 	pixel_x = -8;
 	pixel_y = -20
 	},
@@ -2656,10 +2695,10 @@
 "nn" = (
 /obj/floor_decal/corner/b_green/diagonal,
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/alarm{
+/obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 24;
-	req_access = list("ACCESS_HAND")
+	pixel_x = 21;
+	pixel_y = -8
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/crew/miner_one)
@@ -2699,7 +2738,7 @@
 "nx" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/vulcan{
 	dir = 1;
-	id_tag = "carpod4_pump_out_external"
+	id_tag = "handpodtwo_pump_out_external"
 	},
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/pod_hand_two)
@@ -2769,6 +2808,9 @@
 /obj/machinery/atmospherics/valve/shutoff/fuel{
 	dir = 8
 	},
+/obj/floor_decal/industrial/shutoff{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/miner_two)
 "nS" = (
@@ -2874,7 +2916,10 @@
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_one)
 "op" = (
-/obj/machinery/power/solar,
+/obj/machinery/power/solar{
+	id_tag = "handsolarsport";
+	name = "Port Solar Array"
+	},
 /obj/structure/cable/yellow{
 	d2 = 4;
 	icon_state = "0-4"
@@ -2905,6 +2950,9 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
+/obj/floor_decal/industrial/shutoff{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/shuttle/pod_hand_one)
 "oD" = (
@@ -2998,12 +3046,13 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/floor_decal/industrial/radiation/full,
+/obj/floor_decal/industrial/warning/full,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/maintenance/engine)
 "py" = (
 /obj/machinery/door/airlock/external{
-	id_tag = "handtugtwo_shuttle_inner"
+	id_tag = "handtugtwo_shuttle_inner";
+	frequency = 1380
 	},
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -3014,7 +3063,6 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/obj/shuttle_landmark/handtugtwo/start,
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
 "pz" = (
@@ -3110,6 +3158,12 @@
 /obj/item/gun/projectile/automatic/machine_pistol,
 /obj/item/gun/projectile/automatic/machine_pistol,
 /obj/floor_decal/industrial/outline/yellow,
+/obj/item/ammo_magazine/machine_pistol,
+/obj/item/ammo_magazine/machine_pistol,
+/obj/item/ammo_magazine/machine_pistol,
+/obj/item/ammo_magazine/machine_pistol,
+/obj/item/ammo_magazine/machine_pistol,
+/obj/item/ammo_magazine/machine_pistol,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/cargo/emergency_armory)
 "qb" = (
@@ -3185,6 +3239,16 @@
 /obj/machinery/door/airlock/external,
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_one)
+"qp" = (
+/obj/structure/bed/chair/padded/yellow,
+/obj/floor_decal/corner/b_green/diagonal,
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -22;
+	req_access = list("ACCESS_HAND")
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/ship/hand/crew/miner_one)
 "qs" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	dir = 1
@@ -3234,7 +3298,7 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/hand/command/bridge)
 "qG" = (
-/obj/machinery/computer/shuttle_control,
+/obj/machinery/computer/shuttle_control/explore/pod_hand_two,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/shuttle/pod_hand_two)
 "qI" = (
@@ -3303,7 +3367,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/engineering/starboard)
 "qV" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+	frequency = 1380
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
 "qZ" = (
@@ -3311,6 +3377,12 @@
 /obj/item/shield/riot,
 /obj/item/shield/riot,
 /obj/floor_decal/industrial/outline/yellow,
+/obj/machinery/light_switch{
+	pixel_x = 24;
+	dir = 8;
+	pixel_y = 9
+	},
+/obj/item/shield/riot/metal,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/cargo/emergency_armory)
 "rc" = (
@@ -3455,10 +3527,10 @@
 /obj/floor_decal/corner/yellow/diagonal,
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/alarm{
+/obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 24;
-	req_access = list("ACCESS_HAND")
+	pixel_x = 21;
+	pixel_y = -8
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/crew/miner_three)
@@ -3491,6 +3563,15 @@
 /obj/item/device/scanner/price,
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/engineering/starboard)
+"rI" = (
+/obj/machinery/atmospherics/unary/tank/air{
+	dir = 1;
+	start_pressure = 4559.63
+	},
+/obj/floor_decal/industrial/outline,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/hand/maintenance/atmos)
 "rJ" = (
 /obj/floor_decal/borderfloor{
 	dir = 8
@@ -3564,6 +3645,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/ship/hand/crew/hallway/lower/aft)
+"rS" = (
+/obj/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/ship/hand/crew/hallway/lower/fore)
 "rZ" = (
 /obj/machinery/atmospherics/unary/tank/air{
 	dir = 1;
@@ -3678,7 +3768,8 @@
 /area/ship/hand/shuttle/tug_two)
 "sE" = (
 /obj/machinery/conveyor{
-	dir = 4
+	dir = 4;
+	id_tag = "hand"
 	},
 /obj/machinery/light{
 	dir = 1
@@ -3816,7 +3907,9 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/maintenance/engine)
 "tB" = (
-/obj/machinery/power/solar,
+/obj/machinery/power/solar{
+	id_tag = "handsolarsstarboard"
+	},
 /obj/structure/cable/yellow{
 	d2 = 4;
 	icon_state = "0-4"
@@ -3866,7 +3959,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/maintenance/atmos)
 "tN" = (
-/obj/machinery/power/solar,
+/obj/machinery/power/solar{
+	id_tag = "handsolarsstarboard"
+	},
 /obj/structure/cable/yellow{
 	d2 = 8;
 	icon_state = "0-8"
@@ -3910,6 +4005,11 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	pixel_x = 24;
+	dir = 8;
+	pixel_y = -5
+	},
 /turf/simulated/floor/lino,
 /area/ship/hand/command/medic)
 "tX" = (
@@ -3947,6 +4047,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
+/obj/shuttle_landmark/pod_hand_two/start,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/miner_two)
 "uf" = (
@@ -3972,7 +4073,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/cargo/maints)
 "ul" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+	frequency = 1380
+	},
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
@@ -4092,6 +4195,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/engineering/hallway)
 "uQ" = (
@@ -4109,7 +4213,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/floor_decal/industrial/radiation,
+/obj/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/engineering/hallway)
 "uS" = (
@@ -4240,6 +4344,10 @@
 /obj/paint/sun,
 /turf/simulated/wall/ocp_wall,
 /area/ship/hand/maintenance/atmos/fuel)
+"vW" = (
+/obj/structure/closet/jcloset/sierra,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/ship/hand/maintenance/engine/starboard)
 "vX" = (
 /obj/structure/table/rack,
 /obj/item/storage/firstaid/radiation{
@@ -4304,6 +4412,20 @@
 /obj/structure/lattice,
 /turf/space,
 /area/space)
+"wm" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/catwalk_plated,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/simulated/floor/plating,
+/area/ship/hand/crew/hallway/lower/fore)
 "wn" = (
 /obj/structure/stairs/south,
 /turf/simulated/floor/plating,
@@ -4343,7 +4465,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
 	dir = 4
 	},
-/obj/floor_decal/industrial/radiation{
+/obj/floor_decal/industrial/warning{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4448,7 +4570,7 @@
 /obj/machinery/embedded_controller/radio/airlock/tin_can{
 	dir = 4;
 	frequency = 1431;
-	id_tag = "carpod4";
+	id_tag = "handpodtwo";
 	pixel_x = -17;
 	pixel_y = 25
 	},
@@ -4458,6 +4580,9 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
+/obj/floor_decal/industrial/shutoff{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/shuttle/pod_hand_two)
 "xp" = (
@@ -4852,6 +4977,18 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/shuttle/pod_hand_one)
+"zr" = (
+/obj/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/floor_decal/borderfloor/corner2{
+	dir = 6
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/ship/hand/crew/hallway/lower)
 "zt" = (
 /obj/item/cell/standard,
 /obj/structure/catwalk,
@@ -4937,6 +5074,7 @@
 /obj/item/tape_roll,
 /obj/item/device/geiger,
 /obj/item/pickaxe/hammer,
+/obj/item/clothing/glasses/meson,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_two)
 "zV" = (
@@ -5332,6 +5470,23 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/maintenance/engine)
+"BV" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/catwalk_plated,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/simulated/floor/plating,
+/area/ship/hand/crew/hallway/lower/fore)
 "BZ" = (
 /obj/paint/brown,
 /turf/simulated/wall,
@@ -5372,7 +5527,8 @@
 /area/ship/hand/crew/miner_three)
 "Cl" = (
 /obj/machinery/conveyor{
-	dir = 4
+	dir = 4;
+	id_tag = "hand"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/hallway/lower)
@@ -5392,12 +5548,11 @@
 /area/ship/hand/crew/miner_three)
 "Co" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/storage/pill_bottle/three_eye{
-	pixel_y = 10;
-	pixel_x = 7
-	},
 /obj/floor_decal/corner/b_green/mono,
-/obj/item/storage/pill_bottle/zoom,
+/obj/item/reagent_containers/food/drinks/glass2/coffeecup/corp{
+	pixel_y = -1;
+	pixel_x = -3
+	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/hand/command/bridge)
 "Cp" = (
@@ -5459,6 +5614,7 @@
 	icon_state = "railing0-1"
 	},
 /obj/machinery/atmospherics/valve/shutoff/fuel,
+/obj/floor_decal/industrial/shutoff,
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_one)
 "CB" = (
@@ -5490,7 +5646,8 @@
 /area/ship/hand/crew/hallway/lower)
 "CL" = (
 /obj/machinery/conveyor{
-	dir = 8
+	dir = 8;
+	id_tag = "hand"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/hallway/lower)
@@ -5586,7 +5743,7 @@
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_one)
 "Dt" = (
-/obj/machinery/computer/shuttle_control,
+/obj/machinery/computer/shuttle_control/explore/pod_hand_one,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/shuttle/pod_hand_one)
 "Dv" = (
@@ -5613,12 +5770,14 @@
 /area/ship/hand/engineering/port)
 "Dz" = (
 /obj/machinery/power/solar_control{
-	dir = 8
+	dir = 8;
+	id_tag = "handsolarsstarboard"
 	},
 /obj/structure/sign/warning/airlock{
 	dir = 8;
 	pixel_x = 32
 	},
+/obj/structure/cable/yellow,
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/engineering/starboard)
 "DC" = (
@@ -5629,6 +5788,7 @@
 /area/ship/hand/maintenance/engine/starboard)
 "DE" = (
 /obj/structure/table/woodentable/walnut,
+/obj/item/reagent_containers/food/drinks/bottle/pwine,
 /turf/simulated/floor/wood/ebony,
 /area/ship/hand/crew/miner_one)
 "DG" = (
@@ -5717,6 +5877,7 @@
 	dir = 8
 	},
 /obj/catwalk_plated,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/lower)
 "Eq" = (
@@ -5778,7 +5939,20 @@
 /area/ship/hand/maintenance/atmos)
 "EE" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
-	dir = 1
+	dir = 1;
+	id_tag = "handtugtwor_shuttle"
+	},
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	cycle_to_external_air = 1;
+	frequency = 1380;
+	id_tag = "handtugtwor_shuttle";
+	tag_airpump = "handtugtwor_shuttle_pump";
+	tag_exterior_door = "handtugtwor_shuttle_outer";
+	tag_exterior_sensor = "handtugtwor_shuttle_exterior_sensor";
+	tag_interior_door = "handtugtwor_shuttle_inner";
+	tag_interior_sensor = "handtugtwor_shuttle_sensor";
+	dir = 8;
+	pixel_x = 22
 	},
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
@@ -5803,7 +5977,7 @@
 "EO" = (
 /obj/machinery/airlock_sensor{
 	frequency = 1431;
-	id_tag = "carpod4_interior_sensor";
+	id_tag = "handpodtwo_interior_sensor";
 	pixel_x = -23;
 	pixel_y = 8
 	},
@@ -5814,7 +5988,7 @@
 	pixel_y = -3
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/vulcan{
-	id_tag = "carpod4_pump_out_scrubber";
+	id_tag = "handpodtwo_pump_out_scrubber";
 	power_rating = 15000;
 	scrubbing = "siphon";
 	dir = 8
@@ -5883,6 +6057,7 @@
 /obj/structure/sign/poster{
 	pixel_x = -32
 	},
+/obj/item/clothing/glasses/meson,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_two)
 "Fj" = (
@@ -6379,7 +6554,8 @@
 /area/ship/hand/shuttle/pod_hand_two)
 "Hz" = (
 /obj/machinery/door/airlock/external{
-	id_tag = "handtugone_shuttle_outer"
+	id_tag = "handtugone_shuttle_outer";
+	frequency = 1380
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
 	dir = 6
@@ -6404,10 +6580,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/alarm{
+/obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -22;
-	req_access = list("ACCESS_HAND")
+	pixel_x = -21;
+	pixel_y = -8
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/crew/miner_two)
@@ -6430,6 +6606,9 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/ship/hand/crew/hallway/lower/aft)
 "HJ" = (
@@ -6467,6 +6646,11 @@
 "HQ" = (
 /obj/floor_decal/corner/yellow/diagonal,
 /obj/structure/bed/padded,
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 24;
+	req_access = list("ACCESS_HAND")
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/crew/miner_two)
 "HR" = (
@@ -6533,13 +6717,17 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/shuttle_landmark/pod_hand_one/start,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/shuttle/pod_hand_one)
 "Ij" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
 	id_tag = "handtugtwo_shuttle_pump_out_internal"
 	},
+/obj/machinery/airlock_sensor{
+	frequency = 1380;
+	id_tag = "handtugtwo_shuttle_sensor";
+	pixel_x = 23
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
 "Im" = (
@@ -6587,7 +6775,7 @@
 	pixel_y = 0
 	},
 /obj/structure/barricade,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_two)
 "Ir" = (
 /obj/structure/closet,
@@ -6598,8 +6786,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/clothing/head/helmet,
-/obj/item/clothing/suit/armor/pcarrier/medium,
+/obj/item/clothing/glasses/tacgoggles,
 /turf/simulated/floor/lino,
 /area/ship/hand/command)
 "Is" = (
@@ -6785,7 +6972,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/floor_decal/industrial/radiation/full,
+/obj/floor_decal/industrial/warning/full,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/maintenance/engine)
 "JI" = (
@@ -6991,6 +7178,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
+/obj/shuttle_landmark/handtugtwo/start,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/miner_two)
 "KU" = (
@@ -7030,7 +7218,7 @@
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
 "KZ" = (
-/obj/floor_decal/industrial/radiation,
+/obj/floor_decal/industrial/warning,
 /obj/structure/sign/warning/radioactive{
 	dir = 1;
 	pixel_y = -32
@@ -7071,7 +7259,6 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/shuttle_landmark/pod_hand_two/start,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/shuttle/pod_hand_two)
 "Ln" = (
@@ -7173,10 +7360,10 @@
 /obj/floor_decal/corner/yellow/diagonal,
 /obj/decal/cleanable/dirt,
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/alarm{
+/obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -22;
-	req_access = list("ACCESS_HAND")
+	pixel_x = -21;
+	pixel_y = -8
 	},
 /turf/simulated/floor/steel_dirty,
 /area/ship/hand/crew/miner_two)
@@ -7206,6 +7393,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
+/obj/shuttle_landmark/pod_hand_one/start,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/miner_one)
 "Ml" = (
@@ -7258,6 +7446,11 @@
 /obj/floor_decal/corner/yellow/diagonal,
 /obj/decal/cleanable/dirt,
 /obj/item/trash/candle,
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 24;
+	req_access = list("ACCESS_HAND")
+	},
 /turf/simulated/floor/steel_dirty,
 /area/ship/hand/crew/miner_two)
 "Mx" = (
@@ -7298,14 +7491,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 5
 	},
-/obj/floor_decal/industrial/danger{
-	dir = 8
-	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/floor_decal/industrial/danger{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/ship/hand/crew/hallway/lower/aft)
 "MH" = (
@@ -7438,7 +7631,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_two)
 "Nu" = (
 /obj/structure/catwalk,
@@ -7472,7 +7665,8 @@
 /area/ship/hand/maintenance/atmos)
 "NH" = (
 /obj/machinery/door/airlock/external{
-	id_tag = "drone_engine2_interior_door"
+	id_tag = "drone_engine2_interior_door";
+	frequency = 1380
 	},
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -7541,6 +7735,7 @@
 /obj/item/shuttle_beacon,
 /obj/item/device/multitool,
 /obj/item/tape_roll,
+/obj/item/clothing/glasses/meson,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_three)
 "Oj" = (
@@ -7602,6 +7797,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /turf/simulated/floor/tiled,
 /area/ship/hand/crew/hallway/lower/aft)
 "OJ" = (
@@ -7649,6 +7845,9 @@
 	pixel_x = -23
 	},
 /obj/machinery/light/small,
+/obj/floor_decal/industrial/shutoff{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/miner_one)
 "OQ" = (
@@ -7666,7 +7865,7 @@
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
 "OT" = (
-/obj/floor_decal/industrial/radiation/corner{
+/obj/floor_decal/industrial/warning/corner{
 	dir = 1
 	},
 /obj/structure/janitorialcart,
@@ -7674,6 +7873,11 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = -10
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/maintenance/engine/starboard)
 "OV" = (
@@ -7716,6 +7920,11 @@
 "Pi" = (
 /obj/floor_decal/corner/yellow/diagonal,
 /obj/structure/bed/padded,
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -22;
+	req_access = list("ACCESS_HAND")
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/crew/miner_three)
 "Pj" = (
@@ -7824,6 +8033,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
 /turf/simulated/floor/tiled,
 /area/ship/hand/crew/hallway/lower/fore)
 "PJ" = (
@@ -7845,7 +8055,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/maintenance/atmos)
 "PT" = (
-/obj/machinery/conveyor,
+/obj/machinery/conveyor{
+	id_tag = "hand"
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/hallway/lower)
 "PW" = (
@@ -7905,6 +8117,9 @@
 /obj/floor_decal/borderfloor{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/ship/hand/crew/hallway/lower)
 "Qm" = (
@@ -7950,6 +8165,9 @@
 	power_rating = 25000
 	},
 /obj/machinery/light/small,
+/obj/floor_decal/industrial/shutoff{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/miner_two)
 "Qy" = (
@@ -8003,7 +8221,7 @@
 /area/ship/hand/engineering/starboard)
 "QI" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/floor_decal/industrial/radiation/corner{
+/obj/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
 /obj/structure/sign/warning/radioactive{
@@ -8023,6 +8241,10 @@
 /obj/item/clothing/accessory/storage/holster/thigh,
 /obj/item/clothing/accessory/storage/holster/thigh,
 /obj/floor_decal/industrial/outline/yellow,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/cargo/emergency_armory)
 "QP" = (
@@ -8146,7 +8368,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
 	dir = 4
 	},
-/obj/floor_decal/industrial/radiation{
+/obj/floor_decal/industrial/warning{
 	dir = 4
 	},
 /obj/structure/cable{
@@ -8167,6 +8389,7 @@
 /obj/random/maintenance/clean,
 /obj/random/contraband,
 /obj/floor_decal/industrial/outline/yellow,
+/obj/item/storage/box/lights/bulbs,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/cargo/maints)
 "Ru" = (
@@ -8266,17 +8489,17 @@
 	},
 /obj/random/lilgun,
 /obj/random/lilgun,
-/obj/random/lilgun,
-/obj/random/lilgun,
 /obj/floor_decal/industrial/outline/yellow,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/random/projectile,
+/obj/random/projectile,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/hand/cargo/emergency_armory)
 "Sf" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/vulcan{
-	id_tag = "carpod4_pump_out_internal"
+	id_tag = "handpodtwo_pump_out_internal"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/shuttle/pod_hand_two)
@@ -8329,6 +8552,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_x = 8;
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/maintenance/engine/port)
 "SD" = (
@@ -8350,7 +8577,8 @@
 /area/ship/hand/engineering/starboard)
 "SP" = (
 /obj/machinery/conveyor{
-	dir = 9
+	dir = 9;
+	id_tag = "hand"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/hallway/lower)
@@ -8464,6 +8692,7 @@
 	icon_state = "railing0-1"
 	},
 /obj/machinery/atmospherics/valve/shutoff/fuel,
+/obj/floor_decal/industrial/shutoff,
 /turf/simulated/floor/plating,
 /area/ship/hand/shuttle/tug_two)
 "Tw" = (
@@ -8534,7 +8763,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_three)
 "TK" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
@@ -8550,6 +8779,10 @@
 "TM" = (
 /obj/structure/table/reinforced,
 /obj/floor_decal/corner/b_green/mono,
+/obj/item/reagent_containers/food/drinks/glass2/coffeecup/metal{
+	pixel_y = 9;
+	pixel_x = -2
+	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/hand/command/bridge)
 "TU" = (
@@ -8771,6 +9004,9 @@
 	pixel_x = -23
 	},
 /obj/machinery/light/small,
+/obj/floor_decal/industrial/shutoff{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/miner_three)
 "Vh" = (
@@ -9057,6 +9293,7 @@
 /obj/item/tape_roll,
 /obj/item/device/geiger,
 /obj/item/pickaxe/hammer,
+/obj/item/clothing/glasses/meson,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/miner_three)
 "WP" = (
@@ -9161,6 +9398,7 @@
 /obj/structure/bed/padded,
 /obj/item/reagent_containers/pill/happy,
 /obj/decal/cleanable/blood,
+/obj/item/storage/pill_bottle/zoom,
 /turf/simulated/floor/steel_dirty,
 /area/ship/hand/crew/miner_two)
 "Xv" = (
@@ -9364,6 +9602,11 @@
 	master_tag = "drone_engine";
 	pixel_y = 22
 	},
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/engineering/port)
 "Ym" = (
@@ -9485,6 +9728,9 @@
 	dir = 1;
 	icon_state = "railing0-1"
 	},
+/obj/machinery/conveyor_switch{
+	id_tag = "hand"
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/crew/hallway/lower)
 "YY" = (
@@ -9526,7 +9772,7 @@
 /obj/machinery/vending/tool{
 	dir = 8
 	},
-/obj/floor_decal/industrial/radiation/corner,
+/obj/floor_decal/industrial/warning/corner,
 /obj/structure/sign/warning/radioactive{
 	dir = 8;
 	pixel_x = 32
@@ -9574,7 +9820,8 @@
 /area/ship/hand/engineering/starboard)
 "Zv" = (
 /obj/machinery/conveyor{
-	dir = 5
+	dir = 5;
+	id_tag = "hand"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/crew/hallway/lower)
@@ -16211,7 +16458,7 @@ Pd
 AA
 ZK
 tm
-hk
+qp
 hk
 Gq
 DE
@@ -16946,8 +17193,8 @@ ZO
 ho
 Bx
 PI
-Bx
-WL
+wm
+BV
 Bx
 ON
 fx
@@ -17067,7 +17314,7 @@ XT
 rp
 hX
 Wu
-Wu
+rS
 Wu
 sI
 yN
@@ -17080,7 +17327,7 @@ eL
 eO
 fw
 Az
-eL
+zr
 eO
 fw
 Ro
@@ -17567,7 +17814,7 @@ Uc
 Uc
 Mo
 JB
-gw
+bB
 EY
 ZN
 uf
@@ -17594,7 +17841,7 @@ Ew
 Df
 DG
 Ew
-Ew
+vW
 Ew
 Pc
 uG
@@ -17954,7 +18201,7 @@ KU
 qS
 Ub
 NW
-SQ
+rI
 WP
 wz
 cA
diff --git a/mods/_maps/hand/maps/hand-2.dmm b/mods/_maps/hand/maps/hand-2.dmm
index 3065207e4dd42..5339519acadbb 100644
--- a/mods/_maps/hand/maps/hand-2.dmm
+++ b/mods/_maps/hand/maps/hand-2.dmm
@@ -40,6 +40,7 @@
 	req_access = list("ACCESS_HAND")
 	},
 /obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper)
 "aE" = (
@@ -114,10 +115,18 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/medbay)
 "aZ" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
+	id_tag = "hand_upper"
+	},
 /obj/floor_decal/industrial/warning/cee{
 	dir = 8
 	},
+/obj/machinery/airlock_sensor{
+	id_tag = "hand_upper_sensor_chamber";
+	pixel_x = -12;
+	pixel_y = 24;
+	frequency = 1380
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/airlock)
 "bc" = (
@@ -152,6 +161,18 @@
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/hallway/upper/aft)
+"bD" = (
+/obj/structure/table/rack{
+	dir = 8
+	},
+/obj/random/maintenance/clean,
+/obj/decal/cleanable/dirt,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/ship/hand/cargo)
 "bG" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -204,6 +225,10 @@
 	dir = 9
 	},
 /obj/floor_decal/industrial/outline/yellow,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/medbay/storage)
 "bV" = (
@@ -423,7 +448,11 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/hallway/upper/fore)
 "em" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+	id_tag = "hand_upper_external_door";
+	locked = 1;
+	frequency = 1380
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/airlock)
 "eq" = (
@@ -435,8 +464,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/ship/hand/crew/toilet)
@@ -539,6 +568,7 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/submap_landmark/spawnpoint/away_hand/captain/guardsman,
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/crew)
 "eZ" = (
@@ -788,6 +818,14 @@
 "gQ" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/hallway/upper/fore)
+"gV" = (
+/obj/machinery/door/airlock/external{
+	id_tag = "hand_upper_interior_door";
+	locked = 1;
+	frequency = 1380
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/ship/hand/airlock)
 "gX" = (
 /obj/machinery/sleeper{
 	dir = 4
@@ -816,6 +854,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
 /turf/simulated/floor/wood/walnut,
 /area/ship/hand/crew/bar)
 "ho" = (
@@ -857,6 +898,9 @@
 	dir = 10
 	},
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/aft)
 "hz" = (
@@ -1206,6 +1250,10 @@
 "mF" = (
 /obj/structure/table/marble,
 /obj/machinery/reagent_temperature,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/crew/kitchen)
 "mK" = (
@@ -1281,6 +1329,11 @@
 	pixel_y = 24;
 	req_access = list("ACCESS_HAND")
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -21;
+	pixel_y = -10
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/ship/hand/crew/toilet)
 "nJ" = (
@@ -1527,6 +1580,9 @@
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/aft)
 "qm" = (
@@ -1617,14 +1673,18 @@
 /turf/simulated/floor/tiled/freezer,
 /area/ship/hand/crew/toilet)
 "rb" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+	id_tag = "hand_upper_interior_door";
+	locked = 1;
+	frequency = 1380
+	},
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4;
 	icon_state = "intact"
 	},
 /obj/machinery/access_button/airlock_exterior{
 	frequency = 1380;
-	master_tag = "drone_engine";
+	master_tag = "hand_upper";
 	pixel_y = -23;
 	pixel_z = 1
 	},
@@ -1684,6 +1744,9 @@
 	dir = 1
 	},
 /obj/floor_decal/industrial/outline/yellow,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/medbay/storage)
 "rK" = (
@@ -1724,9 +1787,6 @@
 /obj/item/tank/jetpack/oxygen,
 /obj/item/storage/belt/utility/full,
 /obj/item/storage/belt/utility/full,
-/obj/item/shovel,
-/obj/item/shovel,
-/obj/item/shovel,
 /obj/item/pickaxe/drill,
 /obj/item/pickaxe/drill,
 /obj/item/device/suit_cooling_unit,
@@ -1739,8 +1799,10 @@
 /obj/item/device/radio,
 /obj/item/device/geiger,
 /obj/item/device/binoculars,
-/obj/item/storage/box/greenglowsticks,
 /obj/floor_decal/industrial/outline/yellow,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/ship/hand/engineering/storage)
 "so" = (
@@ -1816,6 +1878,7 @@
 	dir = 1;
 	pixel_y = 21
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/freezer,
 /area/ship/hand/crew/toilet)
 "tj" = (
@@ -1884,6 +1947,9 @@
 /area/ship/hand/crew/hallway/upper/fore)
 "tH" = (
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/airlock)
 "tZ" = (
@@ -1990,11 +2056,19 @@
 	pixel_y = 5
 	},
 /obj/machinery/light,
+/obj/machinery/light_switch{
+	pixel_x = 24;
+	dir = 8;
+	pixel_y = -5
+	},
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/medbay)
 "uR" = (
 /obj/structure/table/reinforced,
 /obj/machinery/reagent_temperature,
+/obj/item/reagent_containers/glass/beaker/cryoxadone{
+	pixel_y = 14
+	},
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/medbay)
 "uT" = (
@@ -2091,6 +2165,17 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/fore)
+"wl" = (
+/obj/structure/hygiene/sink{
+	dir = 8;
+	pixel_x = -12
+	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/ship/hand/crew/toilet)
 "wn" = (
 /obj/machinery/door/firedoor,
 /obj/floor_decal/industrial/hatch/yellow,
@@ -2220,6 +2305,7 @@
 	name = "Hallway"
 	},
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/aft)
 "xT" = (
@@ -2296,6 +2382,12 @@
 	icon_state = "pipe-c"
 	},
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/aft)
 "yY" = (
@@ -2378,15 +2470,17 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/crew/kitchen)
 "Al" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
+	id_tag = "hand_upper"
+	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	frequency = 1380;
-	id_tag = "drone_engine";
+	id_tag = "hand_upper";
 	pixel_y = 26;
-	tag_airpump = "drone_engine_pump";
-	tag_chamber_sensor = "drone_engine_sensor_chamber";
-	tag_exterior_door = "drone_engine_exterior_door";
-	tag_interior_door = "drone_engine_interior_door"
+	tag_airpump = "hand_upper_pump";
+	tag_chamber_sensor = "hand_upper_sensor_chamber";
+	tag_exterior_door = "hand_upper_external_door";
+	tag_interior_door = "hand_upper_interior_door"
 	},
 /obj/floor_decal/industrial/warning/cee{
 	dir = 4
@@ -2585,6 +2679,9 @@
 	dir = 8;
 	icon_state = "railing0-1"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/aft)
 "BU" = (
@@ -2656,6 +2753,9 @@
 	pixel_y = 0
 	},
 /obj/floor_decal/snow,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/ship/hand/crew/kitchen)
 "Ct" = (
@@ -2826,6 +2926,13 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/aft)
+"DI" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/hand/crew/hallway/upper/aft)
 "DL" = (
 /obj/structure/table/rack{
 	dir = 8
@@ -2998,6 +3105,9 @@
 /obj/structure/table/rack,
 /obj/item/storage/briefcase/inflatable,
 /obj/item/storage/briefcase/inflatable,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/airlock)
 "FR" = (
@@ -3039,6 +3149,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/airlock)
+"Ga" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/hand/crew/hallway/upper)
 "Gd" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -3081,6 +3198,10 @@
 	name = "CondiMaster Neo"
 	},
 /obj/floor_decal/industrial/outline/yellow,
+/obj/machinery/light_switch{
+	pixel_x = 21;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/crew/kitchen)
 "HV" = (
@@ -3250,11 +3371,21 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper/aft)
 "Km" = (
 /turf/simulated/floor/tiled/white,
 /area/ship/hand/crew/kitchen)
+"Kr" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/hand/crew/hallway/upper/fore)
 "Ku" = (
 /obj/structure/handrail,
 /turf/simulated/floor/reinforced{
@@ -3286,6 +3417,24 @@
 	},
 /turf/simulated/floor/wood/walnut,
 /area/ship/hand/crew/bar)
+"KE" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = 24;
+	dir = 8
+	},
+/turf/simulated/floor/wood/walnut,
+/area/ship/hand/crew/bar)
 "KH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -3538,6 +3687,16 @@
 /obj/paint/nt_white,
 /turf/simulated/wall/r_wall,
 /area/ship/hand/medbay)
+"NI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/ship/hand/crew/toilet)
 "NM" = (
 /obj/floor_decal/industrial/outline/yellow,
 /obj/decal/cleanable/dirt,
@@ -3643,6 +3802,13 @@
 	icon_state = "1-2"
 	},
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = 6
+	},
 /turf/simulated/floor/plating,
 /area/ship/hand/airlock)
 "Pg" = (
@@ -3709,6 +3875,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/ship/hand/crew/toilet)
 "PW" = (
@@ -3877,6 +4046,9 @@
 /obj/structure/hygiene/sink{
 	pixel_y = -15
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/ship/hand/crew/toilet)
 "Sv" = (
@@ -3914,6 +4086,11 @@
 	icon_state = "1-8"
 	},
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9;
+	pixel_y = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/ship/hand/airlock)
 "Td" = (
@@ -3950,6 +4127,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/medbay/storage)
 "Tu" = (
@@ -4004,6 +4184,7 @@
 /obj/floor_decal/industrial/danger/corner{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/hand/crew/hallway/upper/aft)
 "TY" = (
@@ -4234,6 +4415,9 @@
 /area/ship/hand/engineering/storage)
 "WB" = (
 /obj/structure/dispenser/oxygen,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/airlock)
 "WL" = (
@@ -4339,6 +4523,12 @@
 	},
 /turf/simulated/floor/tiled/white/monotile,
 /area/ship/hand/medbay)
+"XF" = (
+/obj/floor_decal/borderfloorblack,
+/obj/floor_decal/corner/paleblue/border,
+/obj/submap_landmark/spawnpoint/away_hand/captain/pilot,
+/turf/simulated/floor/tiled/white,
+/area/ship/hand/crew)
 "XI" = (
 /obj/machinery/atmospherics/pipe/manifold/visible,
 /obj/structure/catwalk,
@@ -4387,6 +4577,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
 /obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/ship/hand/crew/hallway/upper)
 "YO" = (
@@ -4404,6 +4595,8 @@
 	icon_state = "1-2"
 	},
 /obj/floor_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/hand/airlock)
 "YU" = (
@@ -4430,10 +4623,14 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/hand/medbay/storage)
 "Zu" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+	id_tag = "hand_upper_external_door";
+	locked = 1;
+	frequency = 1380
+	},
 /obj/machinery/access_button/airlock_exterior{
 	frequency = 1380;
-	master_tag = "drone_engine";
+	master_tag = "hand_upper";
 	pixel_y = -23;
 	pixel_z = 1
 	},
@@ -11786,7 +11983,7 @@ xQ
 xQ
 xQ
 lg
-iY
+XF
 yx
 qB
 GV
@@ -11874,7 +12071,7 @@ jD
 hG
 gq
 gq
-gq
+KE
 Cj
 Kz
 iZ
@@ -12096,7 +12293,7 @@ xG
 OA
 qp
 OA
-OA
+bD
 xG
 ed
 cW
@@ -12144,7 +12341,7 @@ nB
 Qo
 lE
 rT
-rT
+wl
 lo
 uT
 BN
@@ -12227,7 +12424,7 @@ zz
 zz
 eJ
 hZ
-gQ
+Kr
 LA
 hZ
 gQ
@@ -12243,7 +12440,7 @@ zF
 fB
 Vl
 Vl
-Vl
+Ga
 bf
 sH
 zF
@@ -12252,7 +12449,7 @@ Vl
 Vl
 Vl
 wn
-dL
+DI
 hD
 hy
 YP
@@ -12500,7 +12697,7 @@ zz
 zz
 zz
 Hi
-em
+gV
 rb
 Hi
 Hi
@@ -12750,7 +12947,7 @@ Hi
 zz
 LG
 th
-er
+NI
 In
 QT
 In