diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm
index 5c430480e4..4e285d671c 100644
--- a/_maps/shuttles/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter_bounty.dmm
@@ -1,56 +1,475 @@
-"a" = (/turf/template_noop,/area/template_noop)
-"b" = (/turf/closed/wall/mineral/plastitanium,/area/shuttle/hunter)
-"c" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external,/turf/open/floor/plating,/area/shuttle/hunter)
-"d" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plating,/area/shuttle/hunter)
-"e" = (/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/open/floor/plating/airless,/area/shuttle/hunter)
-"f" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external,/obj/structure/fans/tiny,/turf/open/floor/plating,/area/shuttle/hunter)
-"g" = (/obj/structure/sign/warning/vacuum/external,/turf/closed/wall/mineral/plastitanium,/area/shuttle/hunter)
-"h" = (/turf/open/floor/plating,/area/shuttle/hunter)
-"i" = (/obj/structure/grille,/obj/item/stack/tile/mineral/plastitanium,/turf/open/floor/plating,/area/shuttle/hunter)
-"j" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating,/area/shuttle/hunter)
-"k" = (/obj/structure/sign/poster/contraband/bountyhunters,/turf/closed/wall/mineral/plastitanium,/area/shuttle/hunter)
-"l" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external,/turf/open/floor/plating,/area/shuttle/hunter)
-"m" = (/obj/structure/chair/office{dir = 4},/turf/open/floor/pod/light,/area/shuttle/hunter)
-"n" = (/obj/structure/table,/turf/open/floor/pod/light,/area/shuttle/hunter)
-"o" = (/obj/structure/chair/office{dir = 8},/turf/open/floor/pod/light,/area/shuttle/hunter)
-"p" = (/obj/effect/mob_spawn/human/fugitive/bounty/hook,/turf/open/floor/pod/light,/area/shuttle/hunter)
-"q" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/open/floor/plating/airless,/area/shuttle/hunter)
-"r" = (/obj/machinery/computer/launchpad{dir = 4},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"s" = (/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"t" = (/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"u" = (/obj/item/circuitboard/computer/bounty,/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"v" = (/obj/structure/chair/office{dir = 4},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"w" = (/obj/structure/table,/obj/item/phone,/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"x" = (/obj/structure/table,/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"y" = (/obj/structure/chair/office{dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"z" = (/obj/structure/chair/comfy/shuttle{dir = 4},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"A" = (/obj/machinery/computer/shuttle/hunter{icon_state = "computer"; dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"B" = (/obj/machinery/launchpad,/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"C" = (/obj/item/multitool,/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"D" = (/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"F" = (/obj/machinery/power/smes,/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"G" = (/obj/machinery/fugitive_capture,/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"H" = (/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"I" = (/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{icon_state = "computer"; dir = 8},/turf/open/floor/pod/dark,/area/shuttle/hunter)
-"J" = (/obj/structure/table,/obj/item/storage/toolbox/mechanical,/turf/open/floor/pod/light,/area/shuttle/hunter)
-"K" = (/obj/machinery/suit_storage_unit/standard_unit{storage_type = /obj/item/tank/internals/oxygen/yellow},/turf/open/floor/pod/light,/area/shuttle/hunter)
-"L" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external,/obj/docking_port/stationary{dwidth = 11;height = 16;id = "pirateship_home";name = "Deep Space";width = 17},/obj/docking_port/mobile{dheight = 3;dwidth = 3;height = 13;id = "huntership";movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);name = "hunter shuttle";width = 15},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/shuttle/hunter)
-"M" = (/obj/effect/mob_spawn/human/fugitive/bounty/armor{icon_state = "sleeper"; dir = 1},/turf/open/floor/pod/light,/area/shuttle/hunter)
-"P" = (/obj/structure/fluff/empty_sleeper{icon_state = "sleeper-open"; dir = 1},/turf/open/floor/pod/light,/area/shuttle/hunter)
-"Z" = (/obj/effect/mob_spawn/human/fugitive/bounty/synth,/turf/open/floor/pod/light,/area/shuttle/hunter)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/hunter)
+"c" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"d" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"e" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/hunter)
+"f" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"g" = (
+/obj/structure/sign/warning/vacuum/external,
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/hunter)
+"h" = (
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"i" = (
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"j" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"k" = (
+/obj/structure/sign/poster/contraband/bountyhunters,
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/hunter)
+"l" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"m" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"n" = (
+/obj/structure/table,
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"o" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"p" = (
+/obj/effect/mob_spawn/human/fugitive/bounty/hook,
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"q" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/hunter)
+"r" = (
+/obj/machinery/computer/launchpad{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"s" = (
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"t" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"v" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"w" = (
+/obj/structure/table,
+/obj/item/phone,
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"x" = (
+/obj/structure/table,
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"y" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"z" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"A" = (
+/obj/machinery/computer/shuttle/hunter{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"B" = (
+/obj/machinery/launchpad,
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"C" = (
+/obj/item/multitool,
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"D" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"F" = (
+/obj/machinery/power/smes,
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"G" = (
+/obj/machinery/fugitive_capture,
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"H" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"I" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"J" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"K" = (
+/obj/machinery/suit_storage_unit/standard_unit{
+	storage_type = /obj/item/tank/internals/oxygen/yellow
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"L" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external,
+/obj/docking_port/stationary{
+	dwidth = 11;
+	height = 16;
+	id = "pirateship_home";
+	name = "Deep Space";
+	width = 17
+	},
+/obj/docking_port/mobile{
+	dheight = 3;
+	dwidth = 3;
+	height = 13;
+	id = "huntership";
+	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
+	name = "hunter shuttle";
+	rechargeTime = 1800;
+	width = 15
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/hunter)
+"M" = (
+/obj/effect/mob_spawn/human/fugitive/bounty/armor{
+	dir = 1
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"P" = (
+/obj/structure/fluff/empty_sleeper{
+	dir = 1
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
+"Z" = (
+/obj/effect/mob_spawn/human/fugitive/bounty/synth,
+/turf/open/floor/pod/light,
+/area/shuttle/hunter)
 
 (1,1,1) = {"
-aabbbbfbaaaaaaaaa
-aaaabbdbbaaaaaaaa
-aaaeqghiiiaaaaaaa
-bbbbbbjbbkbbiiiba
-aaabbblbmnJobpZii
-aaeqrstuvwxyuszAi
-aaaiBCDusxxsussni
-aaeqFGHussssuszIi
-aaabbbcbKKKKbPMii
-bbbbbbdbbbbbiiiba
-aaaeqghiiiaaaaaaa
-aaaabbjbbaaaaaaaa
-aabbbbLbaaaaaaaaa
+a
+a
+a
+b
+a
+a
+a
+a
+a
+b
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+b
+a
+a
+a
+a
+a
+b
+a
+a
+a
+"}
+(3,1,1) = {"
+b
+a
+a
+b
+a
+e
+a
+e
+a
+b
+a
+a
+b
+"}
+(4,1,1) = {"
+b
+a
+e
+b
+b
+q
+i
+q
+b
+b
+e
+a
+b
+"}
+(5,1,1) = {"
+b
+b
+q
+b
+b
+r
+B
+F
+b
+b
+q
+b
+b
+"}
+(6,1,1) = {"
+b
+b
+g
+b
+b
+s
+C
+G
+b
+b
+g
+b
+b
+"}
+(7,1,1) = {"
+f
+d
+h
+j
+l
+t
+D
+H
+c
+d
+h
+j
+L
+"}
+(8,1,1) = {"
+b
+b
+i
+b
+b
+s
+s
+s
+b
+b
+i
+b
+b
+"}
+(9,1,1) = {"
+a
+b
+i
+b
+m
+v
+s
+s
+K
+b
+i
+b
+a
+"}
+(10,1,1) = {"
+a
+a
+i
+k
+n
+w
+x
+s
+K
+b
+i
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+a
+b
+J
+x
+x
+s
+K
+b
+a
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+a
+b
+o
+y
+s
+s
+K
+b
+a
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+a
+i
+b
+s
+s
+s
+b
+i
+a
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+i
+p
+s
+s
+s
+P
+i
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+i
+Z
+z
+s
+z
+M
+i
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+a
+b
+i
+A
+n
+I
+i
+b
+a
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+a
+a
+i
+i
+i
+i
+i
+a
+a
+a
+a
 "}
diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm
index 3031b7da2a..6200c183ef 100644
--- a/_maps/shuttles/hunter_russian.dmm
+++ b/_maps/shuttles/hunter_russian.dmm
@@ -1,501 +1,59 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/template_noop,
-/area/template_noop)
-"b" = (
-/turf/closed/wall,
-/area/shuttle/hunter)
-"c" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/hunter)
-"d" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/hunter)
-"e" = (
-/obj/machinery/portable_atmospherics/scrubber/huge,
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"f" = (
-/obj/machinery/power/smes,
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"g" = (
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"h" = (
-/obj/machinery/door/airlock/security/glass,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"i" = (
-/obj/machinery/door/airlock/security/glass,
-/obj/structure/fans/tiny,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"j" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"k" = (
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"m" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/item/weldingtool/largetank,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"n" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/obj/item/storage/bag/trash{
-	pixel_x = 6
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"o" = (
-/obj/effect/mob_spawn/human/fugitive/russian{
-	dir = 4
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"p" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate{
-	icon_state = "crateopen"
-	},
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"q" = (
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"r" = (
-/obj/effect/turf_decal/arrows{
-	dir = 4
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"s" = (
-/obj/structure/table,
-/obj/item/storage/fancy/cigarettes/cigars/cohiba{
-	pixel_y = 6
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"t" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/large{
-	icon_state = "crittercrate"
-	},
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"u" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"v" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"w" = (
-/obj/machinery/fugitive_capture,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"x" = (
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"y" = (
-/turf/template_noop,
-/area/shuttle/hunter)
-"z" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"A" = (
-/obj/machinery/computer/shuttle/hunter{
-	dir = 8
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"B" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate{
-	icon_state = "crateopen"
-	},
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"C" = (
-/obj/machinery/computer/camera_advanced{
-	dir = 8
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"D" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"E" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
-	dir = 8;
-	x_offset = 0;
-	y_offset = 3
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"F" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/engineering{
-	icon_state = "engi_crateopen"
-	},
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"G" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"H" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate/coffin{
-	icon_state = "coffinopen"
-	},
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"I" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/mecha_wreckage/ripley,
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"J" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"K" = (
-/obj/machinery/door/airlock/security/glass,
-/obj/structure/fans/tiny,
-/obj/docking_port/stationary{
-	dwidth = 11;
-	height = 16;
-	id = "pirateship_home";
-	name = "Deep Space";
-	width = 17
-	},
-/obj/docking_port/mobile{
-	dheight = 3;
-	dwidth = 3;
-	height = 13;
-	id = "huntership";
-	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
-	name = "hunter shuttle";
-	width = 15
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"L" = (
-/obj/effect/mob_spawn/human/fugitive/russian{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/shuttle/hunter)
-"N" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
-"Q" = (
-/obj/item/book/manual/ripley_build_and_repair,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/hunter)
-"Y" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/hunter)
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/turf/closed/wall,/area/shuttle/hunter)
+"c" = (/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/open/floor/plating/airless,/area/shuttle/hunter)
+"d" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/open/floor/plating/airless,/area/shuttle/hunter)
+"e" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/open/floor/plating,/area/shuttle/hunter)
+"f" = (/obj/machinery/power/smes,/turf/open/floor/plating,/area/shuttle/hunter)
+"g" = (/turf/open/floor/plating,/area/shuttle/hunter)
+"h" = (/obj/machinery/door/airlock/security/glass,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"i" = (/obj/machinery/door/airlock/security/glass,/obj/structure/fans/tiny,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"j" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating,/area/shuttle/hunter)
+"k" = (/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"m" = (/obj/structure/reagent_dispensers/fueltank,/obj/item/weldingtool/largetank,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"n" = (/obj/effect/decal/cleanable/dirt/dust,/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket,/obj/item/mop,/obj/item/storage/bag/trash{pixel_x = 6},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"o" = (/obj/effect/mob_spawn/human/fugitive/russian{dir = 4},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"p" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate{icon_state = "crateopen"},/turf/open/floor/plating,/area/shuttle/hunter)
+"q" = (/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"r" = (/obj/effect/turf_decal/arrows{dir = 4},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"s" = (/obj/structure/table,/obj/item/storage/fancy/cigarettes/cigars/cohiba{pixel_y = 6},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"t" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate/large{icon_state = "crittercrate"},/turf/open/floor/plating,/area/shuttle/hunter)
+"u" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"v" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/shuttle/hunter)
+"w" = (/obj/machinery/fugitive_capture,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"x" = (/obj/effect/turf_decal/bot,/turf/open/floor/plating,/area/shuttle/hunter)
+"y" = (/turf/template_noop,/area/shuttle/hunter)
+"z" = (/obj/structure/chair{dir = 4},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"A" = (/obj/machinery/computer/shuttle/hunter{dir = 8},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"B" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate{icon_state = "crateopen"},/turf/open/floor/plating,/area/shuttle/hunter)
+"C" = (/obj/machinery/computer/camera_advanced{dir = 8},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"D" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"E" = (/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{dir = 8; x_offset = 0; y_offset = 3},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"F" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate/engineering{icon_state = "engi_crateopen"},/turf/open/floor/plating,/area/shuttle/hunter)
+"G" = (/obj/structure/table,/obj/item/reagent_containers/food/drinks/bottle/vodka,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"H" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate/coffin{icon_state = "coffinopen"},/turf/open/floor/plating,/area/shuttle/hunter)
+"I" = (/obj/effect/turf_decal/bot,/obj/structure/mecha_wreckage/ripley,/turf/open/floor/plating,/area/shuttle/hunter)
+"J" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"K" = (/obj/machinery/door/airlock/security/glass,/obj/structure/fans/tiny,/obj/docking_port/stationary{dwidth = 11; height = 16; id = "pirateship_home"; name = "Deep Space"; width = 17},/obj/docking_port/mobile{dheight = 3; dwidth = 3; height = 13; id = "huntership"; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "hunter shuttle"; !INVALID_VAR! = 1800; width = 15},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"L" = (/obj/effect/mob_spawn/human/fugitive/russian{dir = 1},/turf/open/floor/plating,/area/shuttle/hunter)
+"N" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
+"Q" = (/obj/item/book/manual/ripley_build_and_repair,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter)
+"Y" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter)
 
 (1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(2,1,1) = {"
-a
-a
-a
-a
-a
-a
-b
-c
-c
-b
-a
-a
-a
-a
-a
-a
-"}
-(3,1,1) = {"
-a
-c
-c
-a
-b
-b
-b
-d
-d
-b
-b
-b
-a
-c
-c
-a
-"}
-(4,1,1) = {"
-b
-d
-d
-b
-b
-p
-t
-x
-B
-B
-F
-b
-b
-d
-d
-b
-"}
-(5,1,1) = {"
-b
-e
-g
-b
-j
-q
-u
-q
-q
-u
-u
-H
-b
-g
-L
-b
-"}
-(6,1,1) = {"
-b
-e
-g
-h
-k
-k
-k
-k
-k
-D
-k
-k
-h
-g
-L
-b
-"}
-(7,1,1) = {"
-b
-f
-g
-b
-x
-k
-Y
-Y
-Y
-Y
-Q
-I
-b
-g
-L
-b
-"}
-(8,1,1) = {"
-b
-b
-b
-b
-b
-h
-b
-b
-b
-b
-h
-b
-b
-b
-b
-b
-"}
-(9,1,1) = {"
-a
-b
-b
-b
-m
-k
-b
-y
-y
-b
-k
-N
-b
-b
-b
-a
-"}
-(10,1,1) = {"
-a
-a
-a
-i
-k
-k
-v
-y
-y
-v
-k
-k
-K
-a
-a
-a
-"}
-(11,1,1) = {"
-a
-a
-a
-b
-n
-r
-b
-y
-y
-b
-r
-J
-b
-a
-a
-a
-"}
-(12,1,1) = {"
-a
-a
-a
-b
-b
-h
-b
-b
-b
-b
-h
-b
-b
-a
-a
-a
-"}
-(13,1,1) = {"
-a
-a
-a
-b
-o
-k
-r
-z
-z
-k
-k
-o
-b
-a
-a
-a
-"}
-(14,1,1) = {"
-a
-a
-a
-b
-b
-s
-w
-A
-C
-E
-G
-b
-b
-a
-a
-a
-"}
-(15,1,1) = {"
-a
-a
-a
-a
-b
-b
-v
-v
-v
-v
-b
-b
-a
-a
-a
-a
+aaabbbbbaaaaaaa
+aacdeefbbaaaaaa
+aacdgggbbaaaaaa
+aaabbhbbbibbbba
+aabbjkxbmknbobb
+aabpqkkhkkrhksb
+abbtukYbbvbbrwv
+acdxqkYbyyybzAv
+acdBqkYbyyybzCv
+abbBuDYbbvbbkEv
+aabFukQhkkrhkGb
+aabbHkIbNkJbobb
+aaabbhbbbKbbbba
+aacdgggbbaaaaaa
+aacdLLLbbaaaaaa
+aaabbbbbaaaaaaa
 "}
diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm
index 7063c38ae0..0800c6f551 100644
--- a/_maps/shuttles/hunter_space_cop.dmm
+++ b/_maps/shuttles/hunter_space_cop.dmm
@@ -29,6 +29,7 @@
 	height = 12;
 	id = "huntership";
 	name = "hunter shuttle";
+	rechargeTime = 1800;
 	width = 7
 	},
 /obj/machinery/door/poddoor/shutters{
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index e845e64529..5282156042 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -162,6 +162,10 @@
 	port_id = "pirate"
 	can_be_bought = FALSE
 
+/datum/map_template/shuttle/hunter
+	port_id = "hunter"
+	can_be_bought = FALSE
+
 /datum/map_template/shuttle/ruin //For random shuttles in ruins
 	port_id = "ruin"
 	can_be_bought = FALSE