Merge remote-tracking branch 'upstream/master'

Rhials · Feb 12, 2024 · 222f6c7 · 222f6c7
2 parents 0af0721 + 9f8d168
commit 222f6c7
Show file tree

Hide file tree

Showing 178 changed files with 72,567 additions and 705 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -524,8 +524,8 @@
 /turf/closed/wall/mineral/sandstone,
 /area/ruin/powered/beach)
 "qK" = (
-/obj/structure/closet/secure_closet/bar/lavaland_bartender_clothes,
 /obj/machinery/light/small/directional/east,
+/obj/structure/closet/secure_closet/bar/lavaland_bartender_clothes,
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "qT" = (