diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index f19e44fdd607..7deba6ed62ee 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -343,11 +343,11 @@
 //We have to find these again since these doors are used on shuttles a lot so the turfs changes
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/update_filler_turfs()
 	for(var/turf/T in multi_filler)
-		T.SetOpacity(null)
+		T.set_opacity(null)
 
 	multi_filler = list()
 	for(var/turf/T in get_filler_turfs())
-		T.SetOpacity(opacity)
+		T.set_opacity(opacity)
 		multi_filler += list(T)
 
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/get_filler_turfs()
diff --git a/code/modules/dropships/attach_points/templates.dm b/code/modules/dropships/attach_points/templates.dm
index 7494e3721b8a..51c870f04b0b 100644
--- a/code/modules/dropships/attach_points/templates.dm
+++ b/code/modules/dropships/attach_points/templates.dm
@@ -108,62 +108,10 @@
 	icon_state = "fuel_base"
 	base_category = DROPSHIP_FUEL_EQP
 
-/obj/effect/attach_point/fuel/Initialize(mapload, ...)
-	. = ..()
-	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))
-
-/obj/effect/attach_point/fuel/Destroy()
-	. = ..()
-	UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
-
-/obj/effect/attach_point/fuel/proc/on_dir_change(datum/source, old_dir, new_dir)
-	return
-
-/obj/effect/attach_point/fuel/left/on_dir_change(datum/source, old_dir, new_dir)
-	SIGNAL_HANDLER
-	switch(new_dir)
-		if(NORTH)
-			pixel_x = 0
-			pixel_y = 0
-		if(EAST)
-			pixel_x = 27
-			pixel_y = -8
-		if(WEST)
-			pixel_x = 5
-			pixel_y = -7
-		if(SOUTH)
-			pixel_x = 32
-			pixel_y = 9
-
-/obj/effect/attach_point/fuel/right
-	pixel_x = -32
-
-/obj/effect/attach_point/fuel/right/on_dir_change(datum/source, old_dir, new_dir)
-	SIGNAL_HANDLER
-	switch(new_dir)
-		if(NORTH)
-			pixel_x = 32
-			pixel_y = 0
-		if(EAST)
-			pixel_x = -27
-			pixel_y = -24
-		if(WEST)
-			pixel_x = 5
-			pixel_y = -7
-		if(SOUTH)
-			pixel_x = 0
-			pixel_y = 9
-
-/obj/effect/attach_point/fuel/left/dropship1
+/obj/effect/attach_point/fuel/dropship1
 	ship_tag = DROPSHIP_ALAMO
 
-/obj/effect/attach_point/fuel/right/dropship1
-	ship_tag = DROPSHIP_ALAMO
-
-/obj/effect/attach_point/fuel/left/dropship2
-	ship_tag = DROPSHIP_NORMANDY
-
-/obj/effect/attach_point/fuel/right/dropship2
+/obj/effect/attach_point/fuel/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
 /obj/effect/attach_point/computer
diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm
index d915ee70ba8b..d89d84ac845c 100644
--- a/code/modules/shuttle/computers/dropship_computer.dm
+++ b/code/modules/shuttle/computers/dropship_computer.dm
@@ -324,7 +324,7 @@
 
 	for(var/obj/docking_port/stationary/marine_dropship/dock as anything in compatible_landing_zones)
 		var/dock_reserved = FALSE
-		var/enabled = dock.enabled
+		var/enabled = TRUE
 		for(var/obj/docking_port/mobile/other_shuttle in SSshuttle.mobile)
 			if(dock == other_shuttle.destination)
 				dock_reserved = TRUE
diff --git a/icons/turf/dropship.dmi b/icons/turf/dropship.dmi
index 357c9ffaa5f6..13ec21832c83 100644
Binary files a/icons/turf/dropship.dmi and b/icons/turf/dropship.dmi differ
diff --git a/icons/turf/dropship2.dmi b/icons/turf/dropship2.dmi
index cf8afa968a00..913db068c073 100644
Binary files a/icons/turf/dropship2.dmi and b/icons/turf/dropship2.dmi differ
diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm
index 7c88144e5737..90893b29fc1a 100644
--- a/maps/shuttles/dropship_alamo.dmm
+++ b/maps/shuttles/dropship_alamo.dmm
@@ -140,7 +140,7 @@
 	},
 /area/shuttle/drop1/sulaco)
 "ne" = (
-/obj/effect/attach_point/fuel/left/dropship1{
+/obj/effect/attach_point/fuel/dropship1{
 	dir = 1
 	},
 /turf/closed/shuttle/dropship1/transparent{
@@ -250,11 +250,6 @@
 	dir = 1
 	},
 /obj/structure/blocker/forcefield/multitile_vehicles,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/machinery/door/airlock/hatch/cockpit,
-/obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -628,9 +623,9 @@
 /turf/open/space/basic,
 /area/shuttle/drop1/sulaco)
 "Ym" = (
-/obj/effect/attach_point/fuel/right/dropship1{
-	pixel_x = -32;
-	dir = 1
+/obj/effect/attach_point/fuel/dropship1{
+	dir = 1;
+	pixel_x = -32
 	},
 /turf/closed/shuttle/dropship1/transparent{
 	icon_state = "33"
diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm
index 5c8b978c0d91..a2ff53358277 100644
--- a/maps/shuttles/dropship_normandy.dmm
+++ b/maps/shuttles/dropship_normandy.dmm
@@ -12,7 +12,7 @@
 	},
 /area/shuttle/drop2/sulaco)
 "by" = (
-/obj/effect/attach_point/fuel/left/dropship2{
+/obj/effect/attach_point/fuel/dropship2{
 	dir = 1
 	},
 /turf/closed/shuttle/dropship2/transparent{
@@ -221,9 +221,9 @@
 	},
 /area/shuttle/drop2/sulaco)
 "to" = (
-/obj/effect/attach_point/fuel/right/dropship2{
-	pixel_x = -32;
-	dir = 1
+/obj/effect/attach_point/fuel/dropship2{
+	dir = 1;
+	pixel_x = -32
 	},
 /turf/closed/shuttle/dropship2/transparent{
 	icon_state = "33"
@@ -313,11 +313,6 @@
 	dir = 1
 	},
 /obj/structure/blocker/forcefield/multitile_vehicles,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/machinery/door/airlock/hatch/cockpit/two,
-/obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},