diff --git a/html/changelogs/Evandorf-Kataphract-Shuttle-Fix.yml b/html/changelogs/Evandorf-Kataphract-Shuttle-Fix.yml
new file mode 100644
index 00000000000..ffa83f3052c
--- /dev/null
+++ b/html/changelogs/Evandorf-Kataphract-Shuttle-Fix.yml
@@ -0,0 +1,58 @@
+################################
+# 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: Evandorf
+
+# 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:
+ - bugfix: "Corrected Dock Target, verified vars, and removed extra docking controller to resolve the Kataphract shuttle not docking properly."
diff --git a/maps/away/ships/kataphracts/kataphract_ship.dm b/maps/away/ships/kataphracts/kataphract_ship.dm
index f63b6379eed..ef950149eec 100644
--- a/maps/away/ships/kataphracts/kataphract_ship.dm
+++ b/maps/away/ships/kataphracts/kataphract_ship.dm
@@ -17,7 +17,7 @@
name = "kataphract chapter ship"
desc = "A large corvette manufactured by a Hephaestus sponsored Hegemonic Guild. This is a heavily armoured Kataphract Chapter ship of the venerable 'Voidbreaker' class, a relative of the more common 'Foundation' \
class used by their counterparts in the Hegemony Navy. These vessels are rarely seen together and strive for maximum self-suffiency as they are the homes and primary means of transportation \
- for questing Kataphracts and their followers. They usually carry enough firepower to deter the common pirate as well as a set of boarding pods for offensive actions. This ship however has no weapon hardpoints detected. It remains capable due to its sturdy design."
+ for questing Kataphracts and their followers. They usually carry enough firepower to deter the common pirate as well as a set of boarding pods for offensive actions. It remains capable due to its sturdy design."
class = "IHKV" //Izweski Hegemony Kataphract Vessel
icon_state = "voidbreaker"
moving_state = "voidbreaker_moving"
@@ -123,7 +123,7 @@
move_time = 20
shuttle_area = list(/area/shuttle/kataphract_shuttle/main_compartment, /area/shuttle/kataphract_shuttle/engine_compartment)
current_location = "nav_hangar_kataphract_shuttle"
- dock_target = "kataphract_transport"
+ dock_target = "airlock_kataphract_transport"
landmark_transition = "nav_kataphract_transport_transit"
range = 2 // It's a big boy
fuel_consumption = 4
@@ -146,7 +146,7 @@
/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar
name = "Shuttle Dock"
landmark_tag = "nav_hangar_kataphract_shuttle"
- master_tag = "airlock_kataphract_ship_shuttle_dock"
+ master_tag = "nav_hangar_kataphract_shuttle"
/obj/effect/shuttle_landmark/kataphract_transport/transit
name = "In transit"
diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm
index 65c8b5035aa..6b8a0a460a1 100644
--- a/maps/away/ships/kataphracts/kataphract_ship.dmm
+++ b/maps/away/ships/kataphracts/kataphract_ship.dmm
@@ -12,13 +12,13 @@
dir = 8;
pixel_y = -6
},
-/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar,
/obj/machinery/light/small/emergency{
dir = 8
},
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar,
/turf/simulated/floor/plating,
/area/kataphract_chapter/hangar)
"ac" = (
@@ -3871,6 +3871,11 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/access_button{
+ pixel_y = 27
+ },
+/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar,
/turf/simulated/floor/tiled,
/area/kataphract_chapter/hangar)
"nr" = (
@@ -3891,17 +3896,17 @@
/area/kataphract_chapter/bruiser)
"nt" = (
/obj/machinery/door/airlock/external,
-/obj/effect/shuttle_landmark/kataphract_transport/hangar,
/obj/machinery/access_button{
pixel_x = -28;
pixel_y = 12;
dir = 1
},
-/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar,
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/shuttle_landmark/kataphract_transport/hangar,
+/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar,
/turf/simulated/floor/plating,
/area/kataphract_chapter/hangar)
"nw" = (
@@ -4234,13 +4239,6 @@
/obj/effect/floor_decal/corner/yellow{
dir = 10
},
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- dir = 1;
- pixel_y = -21;
- name = "Kataphract Shuttle docking port controller";
- frequency = 1380;
- id_tag = "kataphract_dock"
- },
/turf/simulated/floor/tiled,
/area/kataphract_chapter/hangar)
"ru" = (
@@ -5846,15 +5844,11 @@
"Ip" = (
/obj/machinery/door/airlock/external,
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/machinery/access_button{
- pixel_x = -28;
- dir = 2
- },
-/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar,
/obj/effect/map_effect/marker_helper/airlock/interior,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/map_effect/marker/airlock/docking/kataphract_shuttle/hangar,
/turf/simulated/floor/plating,
/area/kataphract_chapter/hangar)
"Iq" = (