From 82684b9d895bc704ff4c94410fdada488bb8475f Mon Sep 17 00:00:00 2001
From: wraith-54321 <69217972+wraith-54321@users.noreply.github.com>
Date: Wed, 1 May 2024 13:54:56 -0700
Subject: [PATCH] y

---
 _maps/~monkestation/RandomBars/Box/clockwork_bar.dmm  | 8 ++------
 _maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm | 8 --------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm b/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm
index 90443a09eef4..419437e7dd91 100644
--- a/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm
+++ b/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm
@@ -191,11 +191,9 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/structure/window/bronze{
-	dir = 1
-	},
 /obj/structure/table/bronze,
 /obj/item/instrument/violin,
+/obj/structure/window/bronze/spawner/directional/north,
 /turf/open/floor/bronze/flat,
 /area/station/service/theater)
 "Ef" = (
@@ -302,9 +300,7 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/structure/window/bronze{
-	dir = 1
-	},
+/obj/structure/window/bronze/spawner/directional/north,
 /turf/open/floor/bronze/flat,
 /area/station/service/theater)
 "RG" = (
diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm
index eef82c94bcfe..885b58643c1b 100644
--- a/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm
+++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm
@@ -2177,14 +2177,6 @@
 	dir = 4
 	},
 /obj/structure/window/spawner/directional/east,
-/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/trimline/yellow/warning{
-	dir = 4
-	},
-/obj/structure/window/spawner/directional/east,
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},