Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · Dec 24, 2023 · ec509c5 · ec509c5
2 parents 131f370 + 3d014cf
commit ec509c5
Show file tree

Hide file tree

Showing 44 changed files with 2,032 additions and 481 deletions.
diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -2724,11 +2724,6 @@
 /obj/machinery/light,
 /turf/open/floor/tile/darkish,
 /area/bigredv2/caves/lambda_lab)
-"axF" = (
-/obj/structure/barricade/wooden,
-/obj/structure/barricade/wooden,
-/turf/open/floor/plating/ground/mars/random/sand,
-/area/bigredv2/outside/n)
 "axP" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -36982,7 +36977,7 @@ gzM
 gzM
 gzM
 gzM
-axF
+aqO
 aqO
 gzM
 gQv