Merge remote-tracking branch 'upstream/master220' into grey_species_r…

…ework
ss220-space · Dec 19, 2024 · ff0b8ac · ff0b8ac
2 parents aaefc83 + 5f8d4c4
commit ff0b8ac
Show file tree

Hide file tree

Showing 174 changed files with 6,959 additions and 4,225 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