Merge branch 'master' into translate

ss220club · Jun 22, 2024 · e07847b · e07847b
2 parents 9c1f930 + 07c47f6
commit e07847b
Show file tree

Hide file tree

Showing 48 changed files with 341 additions and 535 deletions.
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -155,6 +155,7 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Escape Pod Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/powered)
 "I" = (