Merge branch 'master220' into anomalies

ss220-space · Dec 17, 2024 · eadff0b · eadff0b
2 parents 386d3db + a1f3213
commit eadff0b
Show file tree

Hide file tree

Showing 63 changed files with 4,076 additions and 2,917 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
diff --git a/_maps/map_files/RandomZLevels/wildwest.dmm b/_maps/map_files/RandomZLevels/wildwest.dmm
@@ -187,17 +187,6 @@
 "aG" = (
 /turf/simulated/mineral,
 /area/space/nearstation)
-"aH" = (
-/obj/machinery/door/airlock/vault{
-	locked = 1;
-	use_power = 0
-	},
-/obj/machinery/door/airlock/vault{
-	locked = 1;
-	use_power = 0
-	},
-/turf/simulated/floor/engine/cult,
-/area/awaymission/wwvault)
 "aK" = (
 /obj/effect/mob_spawn/human/miner,
 /turf/simulated/floor/engine/cult,
@@ -24237,7 +24226,7 @@ ac
 ac
 ab
 aF
-aH
+aF
 ab
 ab
 ab