Merge branch 'Monkestation:master' into paco-magazine-size

Monkestation · Dec 24, 2024 · f94aba2 · f94aba2
2 parents f446fdf + e26532d
commit f94aba2
Show file tree

Hide file tree

Showing 557 changed files with 19,925 additions and 8,021 deletions.
diff --git a/.gitignore b/.gitignore
@@ -244,3 +244,4 @@ config/dbconfig.txt
 
 # Running OpenDream locally
 tgstation.json
+rust_g64.dll
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
@@ -197,8 +197,8 @@
 /turf/open/floor/engine,
 /area/ruin/syndicate_lava_base/testlab)
 "rX" = (
-/obj/machinery/atmospherics/components/unary/passive_vent,
 /obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on,
 /turf/template_noop,
 /area/ruin/syndicate_lava_base/testlab)
 "sa" = (
Original file line number	Diff line number	Diff line change
Expand Up		@@ -244,3 +244,4 @@ config/dbconfig.txt

		# Running OpenDream locally
		tgstation.json
		rust_g64.dll