diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index 238dc74b703c..aa2ede4dca64 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
@@ -13,9 +13,9 @@ Size = "12x7"
 Purpose = "A multi-role dropship used by almost every group faring space. Its ease of manufacture and high mobility makes it ideal for transport."
 File Path = "_maps\shuttles\subshuttles\indepenent_kunai.dmm"
 
-Name = "Haste Patient Recovery Ship"
+Name = "Haste-class Patient Recovery Ship"
 Size = "6x4"
-Purpose = "A small, nimble ship utilized as an ambulance by Inteq forces"
+Purpose = "A small, nimble ship utilized as an ambulance by Inteq forces."
 File Path = "_maps\shuttles\subshuttles\independant_haste.dmm"
 
 Name = "Sugarcube"
diff --git a/_maps/shuttles/subshuttles/inteq_haste.dmm b/_maps/shuttles/subshuttles/inteq_haste.dmm
index 9fa14787aaa9..c36e3926287e 100644
--- a/_maps/shuttles/subshuttles/inteq_haste.dmm
+++ b/_maps/shuttles/subshuttles/inteq_haste.dmm
@@ -2,33 +2,29 @@
 "a" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
-"e" = (
-/obj/machinery/power/shieldwallgen/atmos{
-	dir = 1;
-	id = "haste_holo";
-	anchored = 1
-	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "haste_door"
+"f" = (
+/obj/machinery/power/terminal{
+	dir = 1
 	},
-/obj/docking_port/mobile{
-	dir = 8;
-	name = "ambulance dock";
-	port_direction = 8;
-	preferred_direction = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /obj/structure/cable/yellow{
-	icon_state = "0-8"
+	icon_state = "0-2"
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
+/obj/effect/turf_decal/techfloor{
+	dir = 1
 	},
-/turf/open/floor/engine/hull/interior,
+/turf/open/floor/plasteel/tech,
 /area/ship/bridge)
-"f" = (
-/obj/machinery/power/terminal{
-	dir = 1
+"s" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
+	id = "haste_door"
+	},
+/obj/machinery/power/shieldwallgen/atmos{
+	id = "haste_holo";
+	anchored = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -36,7 +32,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "B" = (
 /obj/machinery/power/smes/engineering{
@@ -48,12 +44,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-5"
 	},
+/obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "D" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "4-10"
 	},
@@ -64,6 +58,12 @@
 	pixel_y = 22;
 	pixel_x = 10
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "F" = (
@@ -106,6 +106,7 @@
 	icon_state = "0-5"
 	},
 /obj/machinery/light/directional/south,
+/obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "J" = (
@@ -139,22 +140,29 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
+/obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "O" = (
+/obj/machinery/power/shieldwallgen/atmos{
+	dir = 1;
+	id = "haste_holo";
+	anchored = 1
+	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 8;
 	id = "haste_door"
 	},
-/obj/machinery/power/shieldwallgen/atmos{
-	id = "haste_holo";
-	anchored = 1
+/obj/docking_port/mobile{
+	dir = 8;
+	name = "ambulance dock";
+	preferred_direction = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
 /obj/structure/cable/yellow{
-	icon_state = "0-2"
+	icon_state = "1-8"
 	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
@@ -169,6 +177,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
+/obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "T" = (
@@ -211,7 +220,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-10"
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 
 (1,1,1) = {"
@@ -246,7 +255,7 @@ F
 "}
 (6,1,1) = {"
 T
+s
 O
-e
 T
 "}
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 562b95f22397..66919ca67f3b 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -369,7 +369,7 @@
 
 /datum/map_template/shuttle/subshuttles/haste
 	file_name = "inteq_haste"
-	name = "Haste Ambulance"
+	name = "Haste-class Ambulance"
 	prefix = "IRMV"