Merge remote-tracking branch 'upstream/master' into refactor/core-move

ParadiseSS13 · Nov 24, 2024 · 158a552 · 158a552
2 parents f82bdb9 + f978108
commit 158a552
Show file tree

Hide file tree

Showing 67 changed files with 3,262 additions and 3,121 deletions.
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
@@ -169,7 +169,7 @@
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aL" = (
-/obj/mecha/working/ripley/mining,
+/obj/mecha/working/ripley/mining/old,
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aM" = (