y

Monkestation · May 1, 2024 · 82684b9 · 82684b9
1 parent cc3befa
commit 82684b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git 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
@@ -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
 	},