Merge branch 'Monkestation:master' into tram-bar-contest-ocean

Monkestation · Nov 1, 2023 · ecb9f0f · ecb9f0f
2 parents bb58f79 + 795db63
commit ecb9f0f
Show file tree

Hide file tree

Showing 234 changed files with 21,760 additions and 12,783 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" = (