From f4831e9190fea03e16db58ad53427551910820a2 Mon Sep 17 00:00:00 2001 From: wraith-54321 <69217972+wraith-54321@users.noreply.github.com> Date: Fri, 20 Oct 2023 18:40:36 -0700 Subject: [PATCH] ok there we go --- _maps/map_files/generic/CentCom.dmm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 625dbb2d456c..a197f80045b7 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -3840,11 +3840,6 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) -"qD" = ( -/obj/structure/table/reinforced, -/obj/machinery/infuser, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/botany) "qE" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -7345,7 +7340,6 @@ }, /obj/merge_conflict_marker{ name = "---Merge Conflict Marker---"; - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." }, /obj/effect/turf_decal/tile/dark/opposingcorners, @@ -49852,7 +49846,7 @@ aa aa dS rd -qD +yZ xH uE dS