diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm
index 72df7d5fa24..983573881b1 100644
--- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm
@@ -89,6 +89,49 @@
 	icon_living = "columbo"
 	icon_dead = "columbo_dead"
 
+/mob/living/simple_animal/hostile/commanded/dog/tamed_carp
+	name = "armored carp"
+	short_name = "carp"
+	desc = "A ferocious, fang-bearing creature that resembles a fish. This one is armored with a tanned hide and gold. It seems somewhat tame compared to a wild carp."
+
+	health = 125
+	maxhealth = 125
+
+	icon_state = "armored_carp"
+	icon_living = "armored_carp"
+	icon_dead = "armored_carp_dead"
+	icon_rest = "armored_carp_rest"
+	//Carp code
+	speak = list("Glub!", "Glub")
+	speak_emote = list("glubs!", "glubs")
+	emote_hear = list("glubs!", "glubs")
+	sad_emote = list("sad glubs", "pained glubs")
+	emote_sounds = NONE
+	meat_type = /obj/item/reagent_containers/food/snacks/fish/carpmeat
+	butchering_products = list(/obj/item/reagent_containers/food/snacks/fish/roe = 1)
+	organ_names = list("head", "chest", "tail", "left flipper", "right flipper")
+	response_help = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm = "hits the"
+
+	can_be_milked = TRUE
+	udder_size = 3
+	milk_type = /singleton/reagent/toxin/carpotoxin
+	milk_regeneration = list(1, 2)
+	blood_overlay_icon = 'icons/mob/npc/blood_overlay_carp.dmi'
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	attack_emote = "nashes at"
+	flying = TRUE
+	lighting_alpha = LIGHTING_PLANE_ALPHA_SOMEWHAT_INVISIBLE
+
 /mob/living/simple_animal/hostile/commanded/dog/pug
 	name = "pug"
 	desc = "A small dog with a wrinkly muzzle."
diff --git a/html/changelogs/voidtamer_additions.yml b/html/changelogs/voidtamer_additions.yml
new file mode 100644
index 00000000000..faee2d80d8e
--- /dev/null
+++ b/html/changelogs/voidtamer_additions.yml
@@ -0,0 +1,60 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Yonnimer
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds a armored carp, effectively a tame carp for primarily voidtamers."
+  - rscadd: "Adds a new dock to the voidtamer ship that lets ships such as the spark dock with it."
+  - bugfix: "Fixes the waste pipe on the voidtamer ship."
diff --git a/icons/mob/npc/pets.dmi b/icons/mob/npc/pets.dmi
index 9be550bb81e..6dd435e6f27 100644
Binary files a/icons/mob/npc/pets.dmi and b/icons/mob/npc/pets.dmi differ
diff --git a/maps/away/ships/voidtamer/trader/voidtamer_trader.dmm b/maps/away/ships/voidtamer/trader/voidtamer_trader.dmm
index 16281d3eb00..af3af44411b 100644
--- a/maps/away/ships/voidtamer/trader/voidtamer_trader.dmm
+++ b/maps/away/ships/voidtamer/trader/voidtamer_trader.dmm
@@ -444,6 +444,15 @@
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/autocannon_gun)
+"dr" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	pixel_y = 25;
+	req_access = list(256)
+	},
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
 "ds" = (
 /obj/random/dirt_75,
 /obj/structure/bed/roller/hover,
@@ -1162,6 +1171,9 @@
 	icon_state = "1-4"
 	},
 /obj/random/dirt_75,
+/obj/machinery/light/voidtamer{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/crew)
 "ji" = (
@@ -1195,13 +1207,12 @@
 /obj/effect/shuttle_landmark/voidtamer_trader/dock/east{
 	dir = 8
 	},
-/obj/machinery/access_button{
-	pixel_x = 5;
-	pixel_y = 28;
-	req_access = list(256)
-	},
 /obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/east,
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+	req_access = list(256);
+	pixel_y = 28
+	},
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/kitchen)
 "jp" = (
@@ -1242,6 +1253,13 @@
 	},
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/mining)
+"jB" = (
+/obj/machinery/atmospherics/portables_connector/aux{
+	dir = 8
+	},
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
 "jJ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1256,6 +1274,11 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/engineering/starboard)
+"jN" = (
+/obj/random/dirt_75,
+/obj/item/material/stool/chair,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/crew)
 "jQ" = (
 /obj/structure/bed/handrail{
 	dir = 8
@@ -1333,6 +1356,7 @@
 "km" = (
 /obj/machinery/atmospherics/binary/pump/on,
 /obj/random/dirt_75,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor,
 /area/voidtamer/trader/engineering/starboard)
 "kn" = (
@@ -1431,6 +1455,14 @@
 "lx" = (
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/dock)
+"ly" = (
+/obj/machinery/atmospherics/portables_connector/aux{
+	dir = 4
+	},
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/random/dirt_75,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/kitchen)
 "lF" = (
 /obj/machinery/power/apc/north{
 	req_access = list(256)
@@ -1547,11 +1579,10 @@
 /turf/simulated/floor/diona,
 /area/shuttle/voidtamer_trade_ship_shuttle)
 "mD" = (
-/obj/machinery/portable_atmospherics/canister/air/airlock,
-/obj/machinery/atmospherics/portables_connector/aux{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
+/obj/random/dirt_75,
+/obj/random/dirt_75,
+/obj/structure/lattice,
+/turf/simulated/floor,
 /area/voidtamer/trader/kitchen)
 "mG" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
@@ -1659,6 +1690,18 @@
 	},
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/dock)
+"nt" = (
+/obj/random/dirt_75,
+/obj/random/dirt_75,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/kitchen)
+"nC" = (
+/obj/machinery/light/voidtamer,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
 "nF" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
@@ -1797,6 +1840,7 @@
 /obj/item/material/knife{
 	pixel_x = -9
 	},
+/obj/item/reagent_containers/food/snacks/meat/monkey,
 /turf/simulated/floor/tiled/white,
 /area/voidtamer/trader/kitchen)
 "oY" = (
@@ -1859,9 +1903,22 @@
 /area/voidtamer/trader/warehouse)
 "pn" = (
 /obj/random/dirt_75,
-/obj/item/trash/fishjerky,
+/obj/machinery/atmospherics/portables_connector{
+	dir = 4
+	},
+/obj/machinery/portable_atmospherics/canister/empty{
+	name = "waste canister"
+	},
 /turf/simulated/floor,
 /area/voidtamer/trader/engineering/starboard)
+"pq" = (
+/obj/machinery/light/voidtamer{
+	dir = 1;
+	pixel_y = 10
+	},
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
 "pr" = (
 /obj/structure/closet{
 	name = "weapons closet'"
@@ -1903,6 +1960,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/diona,
 /area/shuttle/voidtamer_trade_ship_shuttle)
+"pE" = (
+/obj/machinery/light/voidtamer{
+	dir = 1;
+	pixel_y = 10
+	},
+/obj/structure/diona/bulb,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/kitchen)
 "pJ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1995,6 +2060,7 @@
 /obj/structure/sign/flag/voidtamer{
 	pixel_y = 32
 	},
+/obj/structure/lattice,
 /turf/simulated/floor,
 /area/voidtamer/trader/crew)
 "qp" = (
@@ -2245,6 +2311,11 @@
 "sx" = (
 /turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/voidtamer/trader/engineering/starboard)
+"sy" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux,
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
 "sB" = (
 /obj/item/reagent_containers/glass/bucket,
 /obj/item/mop,
@@ -2297,10 +2368,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/warehouse)
-"sS" = (
-/obj/effect/landmark/entry_point/east,
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/voidtamer/trader/crew)
 "sT" = (
 /obj/structure/diona/bulb,
 /obj/structure/table/steel,
@@ -2346,6 +2413,10 @@
 /obj/random/telecrystals,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/warehouse)
+"tt" = (
+/obj/effect/map_effect/window_spawner/full/reinforced,
+/turf/simulated/floor,
+/area/voidtamer/trader/kitchen)
 "tw" = (
 /obj/structure/lattice/catwalk,
 /turf/template_noop,
@@ -2565,9 +2636,6 @@
 "uL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/random/dirt_75,
-/obj/machinery/light/voidtamer{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-2";
 	dir = 1
@@ -2591,13 +2659,13 @@
 /obj/machinery/door/airlock/external{
 	dir = 4
 	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
 /obj/machinery/access_button{
 	pixel_x = 5;
 	pixel_y = 28;
 	req_access = list(256)
 	},
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
-/obj/effect/map_effect/marker_helper/airlock/exterior,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/crew)
 "uY" = (
@@ -2607,14 +2675,18 @@
 	},
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/autocannon_gun)
+"vd" = (
+/obj/random/dirt_75,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/crew)
+"vf" = (
+/obj/item/material/stool/chair,
+/obj/structure/diona/bulb,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/kitchen)
 "vk" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	pixel_y = 25;
-	req_access = list(256)
-	},
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/light/voidtamer,
+/turf/simulated/floor/diona,
 /area/voidtamer/trader/crew)
 "vo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow{
@@ -2746,9 +2818,7 @@
 /area/space)
 "wm" = (
 /obj/structure/closet/crate/hydroponics/prespawned,
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 8
-	},
+/obj/random/dirt_75,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/kitchen)
 "wn" = (
@@ -2840,8 +2910,10 @@
 /turf/simulated/floor,
 /area/voidtamer/trader/engineering/starboard)
 "xb" = (
-/obj/machinery/pipedispenser,
 /obj/random/dirt_75,
+/obj/machinery/atmospherics/binary/pump/on{
+	dir = 4
+	},
 /turf/simulated/floor,
 /area/voidtamer/trader/engineering/starboard)
 "xc" = (
@@ -2858,6 +2930,14 @@
 /obj/random/dirt_75,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/crew)
+"xd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 8
+	},
+/obj/random/dirt_75,
+/obj/random/dirt_75,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/kitchen)
 "xf" = (
 /obj/random/dirt_75,
 /obj/structure/closet/emcloset,
@@ -2882,6 +2962,8 @@
 	icon_state = "1-2";
 	dir = 1
 	},
+/obj/structure/lattice,
+/obj/random/dirt_75,
 /turf/simulated/floor,
 /area/voidtamer/trader/crew)
 "xq" = (
@@ -2955,6 +3037,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/autocannon_gun)
+"ys" = (
+/obj/item/reagent_containers/food/snacks/meat/monkey,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/kitchen)
 "yz" = (
 /obj/structure/bed/handrail{
 	dir = 8
@@ -2981,6 +3067,10 @@
 /obj/structure/lattice,
 /turf/simulated/floor,
 /area/voidtamer/trader/mining_blaster)
+"yS" = (
+/mob/living/simple_animal/hostile/commanded/dog/tamed_carp,
+/turf/simulated/floor/diona/airless,
+/area/voidtamer/trader/exterior)
 "yZ" = (
 /obj/structure/ship_weapon_dummy,
 /obj/structure/lattice/catwalk,
@@ -3136,11 +3226,21 @@
 /obj/structure/lattice,
 /turf/simulated/floor,
 /area/voidtamer/trader/crew)
+"Ai" = (
+/obj/item/material/stool/chair,
+/obj/structure/lattice,
+/turf/simulated/floor,
+/area/voidtamer/trader/kitchen)
 "Ak" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/item/reagent_containers/food/snacks/meat/monkey,
 /turf/simulated/floor/diona/airless,
 /area/voidtamer/trader/exterior)
+"Ap" = (
+/obj/machinery/light/voidtamer,
+/obj/random/dirt_75,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/kitchen)
 "As" = (
 /obj/machinery/mineral/equipment_vendor,
 /obj/random/dirt_75,
@@ -3189,15 +3289,13 @@
 /turf/simulated/floor,
 /area/voidtamer/trader/dock)
 "Bc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 8
+/obj/machinery/airlock_sensor{
+	pixel_y = 28;
+	pixel_x = 6
 	},
-/obj/machinery/door/airlock/external{
-	dir = 4
-	},
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
-/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor/tiled/dark,
+/obj/random/dirt_75,
+/obj/structure/diona/bulb,
+/turf/simulated/floor/diona,
 /area/voidtamer/trader/crew)
 "Be" = (
 /obj/structure/cable{
@@ -3460,6 +3558,7 @@
 	dir = 4
 	},
 /obj/random/dirt_75,
+/obj/machinery/pipedispenser,
 /turf/simulated/floor,
 /area/voidtamer/trader/engineering/starboard)
 "Di" = (
@@ -3532,6 +3631,12 @@
 "DJ" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/voidtamer/trader/supermatter)
+"DL" = (
+/obj/random/dirt_75,
+/obj/machinery/light/voidtamer,
+/obj/structure/flora/pottedplant/tropical,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
 "DR" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/structure/table/steel,
@@ -3580,16 +3685,16 @@
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/temple)
 "El" = (
-/obj/machinery/door/airlock/external{
-	dir = 4
+/obj/effect/shuttle_landmark/voidtamer_trader/dock/north{
+	dir = 1
 	},
+/obj/machinery/door/airlock/external,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
 /obj/machinery/access_button{
-	pixel_x = 5;
-	pixel_y = 28;
-	req_access = list(256)
+	req_access = list(256);
+	pixel_x = 28
 	},
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
-/obj/effect/map_effect/marker_helper/airlock/interior,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/crew)
 "Eo" = (
@@ -3653,9 +3758,10 @@
 /turf/simulated/floor,
 /area/shuttle/voidtamer_trade_ship_shuttle)
 "EE" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
-/obj/machinery/light/voidtamer,
+/obj/machinery/alarm/west{
+	req_one_access = null;
+	req_access = list(256)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/crew)
 "EG" = (
@@ -4090,6 +4196,11 @@
 	},
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/dock)
+"HW" = (
+/obj/structure/diona/vines,
+/mob/living/simple_animal,
+/turf/space/dynamic,
+/area/voidtamer/trader/exterior)
 "Ia" = (
 /obj/item/flag/xanu/l,
 /obj/machinery/recharger{
@@ -4595,11 +4706,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/voidtamer_trade_ship_shuttle)
 "Mr" = (
-/obj/machinery/portable_atmospherics/canister/empty{
-	name = "waste canister"
-	},
-/obj/machinery/atmospherics/portables_connector,
 /obj/random/dirt_75,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10
+	},
 /turf/simulated/floor,
 /area/voidtamer/trader/engineering/starboard)
 "Mu" = (
@@ -4636,10 +4746,7 @@
 	},
 /obj/random/dirt_75,
 /obj/item/trash/can/adhomian_can,
-/obj/machinery/alarm/west{
-	req_one_access = null;
-	req_access = list(256)
-	},
+/obj/structure/lattice,
 /turf/simulated/floor,
 /area/voidtamer/trader/crew)
 "ML" = (
@@ -4866,6 +4973,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/crew)
+"OA" = (
+/obj/random/dirt_75,
+/mob/living/simple_animal/hostile/commanded/dog/tamed_carp,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/kitchen)
 "OB" = (
 /obj/random/dirt_75,
 /obj/structure/lattice,
@@ -4978,11 +5090,8 @@
 /turf/simulated/floor/grass/no_edge,
 /area/voidtamer/trader/temple)
 "Pu" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4
-	},
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
-/turf/simulated/floor/tiled/dark,
+/obj/effect/map_effect/window_spawner/full/reinforced,
+/turf/simulated/floor,
 /area/voidtamer/trader/crew)
 "Pv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -5234,6 +5343,18 @@
 	},
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/dock)
+"Rw" = (
+/obj/random/dirt_75,
+/obj/random/dirt_75,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/kitchen)
+"Ry" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+	dir = 4
+	},
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
 "Rz" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -5277,6 +5398,11 @@
 /obj/structure/sign/radiation,
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/voidtamer/trader/supermatter)
+"RN" = (
+/obj/machinery/light/voidtamer,
+/obj/structure/flora/pottedplant/tropical,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/kitchen)
 "Sa" = (
 /turf/simulated/floor,
 /area/shuttle/voidtamer_trade_ship_shuttle)
@@ -5332,12 +5458,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/voidtamer_trade_ship_shuttle)
 "SU" = (
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
-/obj/machinery/airlock_sensor{
-	pixel_y = 28;
-	pixel_x = 6
-	},
-/turf/simulated/floor/tiled/dark,
+/obj/structure/lattice,
+/obj/random/dirt_75,
+/turf/simulated/floor,
 /area/voidtamer/trader/crew)
 "SW" = (
 /obj/structure/closet/secure_closet/kitchen_cabinet/standard,
@@ -5455,6 +5578,11 @@
 	},
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/mining)
+"Up" = (
+/obj/random/dirt_75,
+/obj/structure/lattice,
+/turf/simulated/floor,
+/area/voidtamer/trader/crew)
 "Ut" = (
 /obj/structure/cable{
 	icon_state = "1-2";
@@ -5507,6 +5635,11 @@
 /obj/structure/platform_stairs,
 /turf/simulated/floor/tiled/gunmetal,
 /area/voidtamer/trader/bridge)
+"Vj" = (
+/obj/random/dirt_75,
+/obj/structure/diona/bulb,
+/turf/simulated/floor/diona,
+/area/voidtamer/trader/crew)
 "Vm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow,
 /turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -5564,15 +5697,9 @@
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/dock)
 "VV" = (
-/obj/machinery/door/airlock/external{
-	dir = 4
-	},
-/obj/effect/landmark/entry_point/east,
-/obj/effect/shuttle_landmark/voidtamer_trader/dock/west{
-	dir = 4
-	},
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west,
+/obj/machinery/door/airlock/external,
 /obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/crew)
 "VY" = (
@@ -5902,6 +6029,14 @@
 /obj/structure/diona/bulb,
 /turf/simulated/floor/diona,
 /area/voidtamer/trader/mining_blaster)
+"XN" = (
+/obj/machinery/light/voidtamer{
+	dir = 1;
+	pixel_y = 10
+	},
+/obj/random/dirt_75,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/kitchen)
 "XP" = (
 /obj/structure/table/rack/folding_table,
 /obj/machinery/light/voidtamer{
@@ -5978,6 +6113,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/floor_damage/broken4,
+/mob/living/simple_animal/hostile/commanded/dog/tamed_carp,
 /turf/simulated/floor/tiled/dark,
 /area/voidtamer/trader/kitchen)
 "Yl" = (
@@ -6162,6 +6298,22 @@
 	},
 /turf/simulated/floor,
 /area/voidtamer/trader/engineering/port)
+"ZP" = (
+/obj/machinery/door/airlock/external{
+	dir = 4
+	},
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 8
+	},
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north,
+/turf/simulated/floor/tiled/dark,
+/area/voidtamer/trader/crew)
+"ZT" = (
+/obj/random/dirt_75,
+/obj/random/dirt_75,
+/turf/simulated/floor,
+/area/voidtamer/trader/kitchen)
 "ZU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow{
 	dir = 4
@@ -25082,10 +25234,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Ci
+Pu
+Pu
+Ci
 Wc
 Wc
 Wc
@@ -25339,10 +25491,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Ci
+pq
+Ry
+VV
 Wc
 Wc
 Wc
@@ -25596,10 +25748,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Ci
+dr
+sy
+El
 Wc
 Wc
 Wc
@@ -25853,10 +26005,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Ci
+uV
+ZP
+Ci
 Wc
 Wc
 Wc
@@ -26110,10 +26262,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Ci
+te
+nC
+Ci
 Wc
 Wc
 Wc
@@ -26367,10 +26519,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Pu
+te
+jB
+Pu
 Wc
 Wc
 Wc
@@ -26624,10 +26776,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Pu
+te
+EP
+Pu
 Wc
 Wc
 Wc
@@ -26881,10 +27033,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Pu
+Up
+Up
+Pu
 Wc
 Wc
 Wc
@@ -27138,10 +27290,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+jY
+Vj
+DL
+Ci
 Wc
 Wc
 Wc
@@ -27395,10 +27547,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+Pu
+vd
+jN
+Pu
 Wc
 Wc
 Wc
@@ -27652,6 +27804,10 @@ Wc
 Wc
 Wc
 Wc
+Pu
+vd
+MB
+Pu
 Wc
 Wc
 Wc
@@ -27659,10 +27815,6 @@ Wc
 Wc
 Wc
 Wc
-Ci
-uV
-VV
-Ci
 Wc
 Wc
 Wc
@@ -27909,17 +28061,17 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
-Wc
-Wc
-Wc
-Ci
+Pu
+Bc
 SU
 Pu
-Ci
+Wc
+Wc
+Wc
+Wc
+Wc
+Wc
+Wc
 Wc
 Wc
 Wc
@@ -28166,17 +28318,17 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
-Wc
-Wc
-Wc
-Ci
+jY
+TN
 vk
-EE
-Ci
+jY
+Wc
+Wc
+Wc
+Wc
+Wc
+Wc
+Wc
 Wc
 Wc
 Wc
@@ -28423,16 +28575,16 @@ Wc
 Wc
 Wc
 Wc
-Ci
-Ci
-sS
+jY
+vd
+MB
+jY
+jY
 Ci
 Ci
 Ci
 Ci
 Ci
-El
-Bc
 Ci
 Wc
 Wc
@@ -28680,12 +28832,12 @@ Wc
 Wc
 Wc
 Wc
-Ci
+jY
 MJ
 xp
 uL
 jd
-EP
+EE
 TF
 Ij
 te
@@ -28908,7 +29060,7 @@ Wc
 Fr
 il
 il
-Jg
+yS
 SK
 Jg
 Jg
@@ -28937,7 +29089,7 @@ Wc
 Wc
 Wc
 Wc
-Ci
+jY
 qm
 xf
 xf
@@ -29937,7 +30089,7 @@ Dl
 il
 RI
 Jg
-Jg
+yS
 Ak
 SK
 kq
@@ -34342,7 +34494,7 @@ sZ
 SW
 WQ
 Ie
-rE
+OA
 iV
 kB
 JV
@@ -34854,9 +35006,9 @@ Eu
 AI
 kj
 gi
-gi
+ys
 AC
-rE
+OA
 dm
 kB
 JV
@@ -35329,7 +35481,7 @@ Wc
 Wc
 Wc
 Wc
-Fr
+HW
 Fr
 il
 jt
@@ -35628,7 +35780,7 @@ Tu
 dd
 GB
 FB
-mD
+JN
 GO
 wP
 Qy
@@ -35884,7 +36036,7 @@ Fa
 rg
 eq
 Xi
-JN
+FB
 wm
 GO
 GO
@@ -36141,8 +36293,8 @@ ga
 ga
 ga
 ga
-Hq
-IO
+XN
+Ap
 ga
 Wc
 Wc
@@ -36398,8 +36550,8 @@ Wc
 Wc
 Wc
 ga
-jS
-iG
+FB
+JN
 ga
 Wc
 Wc
@@ -36654,10 +36806,10 @@ Wc
 Wc
 Wc
 Wc
-ga
-tY
-pf
-ga
+tt
+JN
+FB
+tt
 Wc
 Wc
 Wc
@@ -36911,10 +37063,10 @@ Wc
 Wc
 Wc
 Wc
-ga
-jl
-IQ
-ga
+tt
+JN
+FB
+tt
 Wc
 Wc
 Wc
@@ -37168,10 +37320,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+tt
+nt
+mD
+tt
 Wc
 Wc
 Wc
@@ -37425,10 +37577,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+tt
+Rw
+vf
+tt
 Wc
 Wc
 Wc
@@ -37682,10 +37834,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+ke
+pE
+RN
+ga
 Wc
 Wc
 Wc
@@ -37939,10 +38091,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+tt
+gi
+Ai
+tt
 Wc
 Wc
 Wc
@@ -38196,10 +38348,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+tt
+ZT
+Og
+tt
 Wc
 Wc
 Wc
@@ -38453,10 +38605,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+tt
+FB
+ly
+tt
 Wc
 Wc
 Wc
@@ -38710,10 +38862,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+tt
+FB
+xd
+tt
 Wc
 Wc
 Wc
@@ -38967,10 +39119,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+ga
+Hq
+IO
+ga
 Wc
 Wc
 Wc
@@ -39224,10 +39376,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+ga
+jS
+iG
+ga
 Wc
 Wc
 Wc
@@ -39481,10 +39633,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+ga
+tY
+pf
+ga
 Wc
 Wc
 Wc
@@ -39738,10 +39890,10 @@ Wc
 Wc
 Wc
 Wc
-Wc
-Wc
-Wc
-Wc
+ga
+jl
+IQ
+ga
 Wc
 Wc
 Wc
diff --git a/maps/away/ships/voidtamer/trader/voidtamer_trader_landmarks.dm b/maps/away/ships/voidtamer/trader/voidtamer_trader_landmarks.dm
index 423b1f41c18..75efa36b602 100644
--- a/maps/away/ships/voidtamer/trader/voidtamer_trader_landmarks.dm
+++ b/maps/away/ships/voidtamer/trader/voidtamer_trader_landmarks.dm
@@ -23,15 +23,15 @@
 
 // --------------------- docks
 
-/obj/effect/shuttle_landmark/voidtamer_trader/dock/west
-	name = "Dock, West"
-	landmark_tag = "nav_voidtamer_ship_west"
-	docking_controller = "airlock_voidtamer_ship_west"
+/obj/effect/shuttle_landmark/voidtamer_trader/dock/north
+	name = "Dock, North"
+	landmark_tag = "nav_voidtamer_ship_north"
+	docking_controller = "airlock_voidtamer_ship_north"
 
-/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west
-	name = "Dock, West"
-	landmark_tag = "nav_voidtamer_ship_dock_west"
-	master_tag = "airlock_voidtamer_ship_west"
+/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north
+	name = "Dock, North"
+	landmark_tag = "nav_voidtamer_ship_dock_north"
+	master_tag = "airlock_voidtamer_ship_north"
 
 /obj/effect/shuttle_landmark/voidtamer_trader/dock/east
 	name = "Dock, East"