Merge pull request #1195 from SaraSayomi/b8adb77-Mapping-fixes

Fixes mapping bug from b8adb77
SPLURT-Station · Aug 29, 2024 · 392987d · 392987d
2 parents 05956f3 + 00fe793
commit 392987d
Showing 1 changed file with 0 additions and 21 deletions.
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
@@ -2506,27 +2506,6 @@
 	},
 /obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/docking_port/mobile{
-	callTime = 250;
-	can_move_docking_ports = 1;
-	dheight = 0;
-	dir = 2;
-	dwidth = 11;
-	height = 17;
-	shuttle_id = "whiteship";
-	launch_status = 0;
-	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
-	name = "Salvage Ship";
-	port_direction = 8;
-	preferred_direction = 4;
-	width = 33
-	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/machinery/door/airlock/external,
-/obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/docking_port/mobile{
 	callTime = 250;
 	can_move_docking_ports = 1;