Skip to content

Commit

Permalink
Replaces xeno_spawn with the generic_maintenance_landmark, adds atmos…
Browse files Browse the repository at this point in the history
… safety checks to remaining midrounds that need them (tgstation#74374)

## About The Pull Request

The xeno_spawn landmark, used to pick spawn locations for many different
midrounds (but NOT xenomorphs, ironically), has been killed and been
replaced with the generic_maintenance_landmark landmark.

This also adds atmos safety checks to some of the midround spawn
location selections that were missing them:

- Paradox Clone
- Nightmare
- Fugitives
- Morph

I decided to do both of these at the same time, since I'd be touching
most of the same files anyways.

This includes an updatepaths that, if you are on a downstream running a
custom map, should probably definitely run.
## Why It's Good For The Game

It may not be a secret that these landmarks aren't used for spawning
xenomorphs anymore, but the name is still deceptive. This should
communicate what they're used for a bit better to both coders and
mappers.

Atmos safety checks (for the midrounds I hadn't yet added them to) make
sure people can play the game.

Closes tgstation#74372.
## Changelog
:cl:
code: The xeno_spawn landmark is now the generic_maintenance_landmark
landmark.
fix: Certain midrounds will now check for atmos safety before spawning.
/:cl:
  • Loading branch information
Rhials authored Apr 3, 2023
1 parent 7846612 commit c0719d7
Show file tree
Hide file tree
Showing 33 changed files with 181 additions and 171 deletions.
74 changes: 37 additions & 37 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4408,7 +4408,7 @@
"bcJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/blobstart,
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/yellow/fourcorners,
Expand Down Expand Up @@ -4763,7 +4763,7 @@
},
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/blobstart,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
"bgL" = (
Expand Down Expand Up @@ -5409,7 +5409,7 @@
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
"bnN" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/structure/chair/wood{
dir = 4
},
Expand Down Expand Up @@ -5956,7 +5956,7 @@
/area/station/engineering/atmos/storage/gas)
"buj" = (
/obj/effect/landmark/blobstart,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -8530,7 +8530,7 @@
dir = 4
},
/obj/effect/decal/cleanable/blood/old,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/turf/open/floor/wood,
/area/station/maintenance/starboard/aft)
Expand Down Expand Up @@ -9633,7 +9633,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
Expand Down Expand Up @@ -13409,7 +13409,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"dkH" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 4
Expand Down Expand Up @@ -17098,7 +17098,7 @@
/area/station/medical/medbay/lobby)
"eix" = (
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/security/detectives_office/private_investigators_office)
Expand Down Expand Up @@ -17569,7 +17569,7 @@
/area/station/science/breakroom)
"epp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
Expand Down Expand Up @@ -18757,7 +18757,7 @@
/area/station/hallway/secondary/exit/departure_lounge)
"eEA" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand Down Expand Up @@ -21312,7 +21312,7 @@
/area/station/medical/pharmacy)
"fjX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
Expand Down Expand Up @@ -25573,7 +25573,7 @@
/area/station/maintenance/port)
"gnZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/blobstart,
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
Expand Down Expand Up @@ -32213,7 +32213,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/blobstart,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -34264,7 +34264,7 @@
/area/station/hallway/secondary/entry)
"iyX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
Expand Down Expand Up @@ -35163,7 +35163,7 @@
"iKM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -38107,7 +38107,7 @@
/turf/open/floor/iron/dark,
/area/station/service/theater)
"jwg" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"jwr" = (
Expand Down Expand Up @@ -42059,7 +42059,7 @@
"kss" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/blobstart,
/obj/machinery/duct,
/turf/open/floor/plating,
Expand Down Expand Up @@ -44942,7 +44942,7 @@
dir = 8
},
/obj/effect/landmark/blobstart,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/wood,
Expand Down Expand Up @@ -47244,7 +47244,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
Expand Down Expand Up @@ -48134,7 +48134,7 @@
"lTE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
Expand Down Expand Up @@ -48778,7 +48778,7 @@
/area/station/security/checkpoint/customs/fore)
"mec" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/mob/living/basic/cockroach,
Expand Down Expand Up @@ -49849,7 +49849,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/blobstart,
/obj/effect/landmark/event_spawn,
/obj/structure/chair/stool/directional/west,
Expand Down Expand Up @@ -54148,7 +54148,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"nxh" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
Expand Down Expand Up @@ -57683,7 +57683,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/blobstart,
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral/fourcorners,
Expand Down Expand Up @@ -62637,7 +62637,7 @@
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"pGT" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
Expand Down Expand Up @@ -71068,7 +71068,7 @@
/area/station/maintenance/department/science)
"rMz" = (
/obj/structure/lattice/catwalk,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/space,
/area/station/solars/starboard/fore)
"rMN" = (
Expand Down Expand Up @@ -72433,7 +72433,7 @@
"scd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/blobstart,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/newscaster/directional/east,
/turf/open/floor/plating,
/area/station/service/library/abandoned)
Expand Down Expand Up @@ -79449,7 +79449,7 @@
/area/station/hallway/secondary/command)
"tPk" = (
/obj/structure/lattice/catwalk,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/space,
/area/station/solars/port/aft)
"tPo" = (
Expand Down Expand Up @@ -80325,7 +80325,7 @@
},
/obj/effect/turf_decal/bot_red,
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/tile/yellow/opposingcorners{
dir = 1
},
Expand Down Expand Up @@ -81985,7 +81985,7 @@
"uwj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron/dark,
/area/station/service/electronic_marketing_den)
"uwn" = (
Expand Down Expand Up @@ -82845,7 +82845,7 @@
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
"uGP" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
Expand Down Expand Up @@ -85176,7 +85176,7 @@
"vkM" = (
/obj/effect/spawner/random/structure/chair_flipped,
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
Expand Down Expand Up @@ -87985,7 +87985,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/port)
Expand Down Expand Up @@ -89118,7 +89118,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"wjt" = (
Expand Down Expand Up @@ -92356,7 +92356,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron,
/area/station/science/research/abandoned)
"wYZ" = (
Expand Down Expand Up @@ -94629,7 +94629,7 @@
dir = 4
},
/obj/effect/landmark/blobstart,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
Expand Down Expand Up @@ -95820,7 +95820,7 @@
dir = 1
},
/obj/effect/landmark/event_spawn,
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
"xQM" = (
Expand Down
Loading

0 comments on commit c0719d7

Please sign in to comment.