Merge branch 'master' into inter-rim

cmss13-devs · Sep 19, 2024 · 44c64f4 · 44c64f4
2 parents 8f0087e + cfcf843
commit 44c64f4
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -13391,7 +13391,6 @@
 	dir = 4;
 	pixel_x = 21
 	},
-/obj/structure/surface/table/almayer,
 /turf/open/floor/almayer/cargo,
 /area/golden_arrow/briefing)
 "aTc" = (