From 00fe7934917c7f828495740551dc520bda9ffb33 Mon Sep 17 00:00:00 2001 From: xhianil Date: Tue, 27 Aug 2024 22:10:37 -0600 Subject: [PATCH] Fixes mapping bug from b8adb77 Removes double layered map bug and merge conflict from b8adb77 --- _maps/shuttles/whiteship_meta.dmm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 0eec3618200f..c3b28f91e8ce 100644 --- 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;