Merge branch 'master' into floran-wants-to-stab

Monkestation · Oct 23, 2023 · 5b74e15 · 5b74e15
2 parents bca368e + 517774f
commit 5b74e15
Show file tree

Hide file tree

Showing 68 changed files with 2,156 additions and 1,239 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" = (