Merge remote-tracking branch 'upstream/master'

definitelynotspaghetti · Nov 23, 2024 · fea3ddf · fea3ddf
2 parents 7f19aa1 + a06010a
commit fea3ddf
Show file tree

Hide file tree

Showing 292 changed files with 7,378 additions and 5,732 deletions.
diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -2726,10 +2726,6 @@
 /obj/machinery/light,
 /turf/open/floor/tile/darkish,
 /area/bigredv2/caves/lambda_lab)
-"axF" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/plating/ground/mars/random/sand,
-/area/bigredv2/outside/n)
 "axP" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -37102,7 +37098,7 @@ gzM
 gzM
 gzM
 gzM
-axF
+aqO
 aqO
 gzM
 gQv