Merge branch 'master' into battle-royale

Monkestation · Nov 1, 2023 · 065d834 · 065d834
2 parents be9c24c + 795db63
commit 065d834
Show file tree

Hide file tree

Showing 331 changed files with 25,910 additions and 13,102 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -375,8 +375,8 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/machinery/splicer,
 /obj/item/food/grown/poppy/lily,
+/obj/machinery/plantgenes,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/seedvault)
 "bb" = (