From e28a57798d7ba5db7cb561ff03c96981b95e2bd7 Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Wed, 13 Sep 2023 15:48:55 -0400
Subject: [PATCH] CI now bans nearspace that is not on turf/space (#22263)

* nearspace now fails if the turf is not space

* uhh, forgot airless platings. Those are fine too.

* yeah, put the name down too

* first round of fixes

* cerestation too

* code changes

* oops double space error

* delta fixes?

* fixes

* fuck, uh, keep it but make it airless

* there we go. All fixed

* uhhh, now it works?

* this is my guess
---
 _maps/map_files/Delta/delta.dmm             | 96 +++++++++------------
 _maps/map_files/MetaStation/MetaStation.dmm | 58 ++++++-------
 _maps/map_files/cerestation/cerestation.dmm |  2 +-
 code/modules/unit_tests/map_tests.dm        | 15 ++++
 4 files changed, 86 insertions(+), 85 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 054257ca0e7..62d498eb1fd 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -13356,7 +13356,7 @@
 /area/station/public/storage/art)
 "aPT" = (
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "aPU" = (
 /obj/structure/table/wood,
@@ -14041,7 +14041,7 @@
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance/eight,
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/plasteel{
+/turf/simulated/floor/plasteel/airless{
 	dir = 10;
 	icon_state = "darkblue"
 	},
@@ -15433,7 +15433,7 @@
 /area/station/hallway/primary/fore)
 "aUA" = (
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/plasteel{
+/turf/simulated/floor/plasteel/airless{
 	dir = 5;
 	icon_state = "darkblue"
 	},
@@ -26640,15 +26640,9 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/station/hallway/primary/central)
-"btI" = (
-/obj/structure/closet/emcloset,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
-/area/space/nearstation)
 "btJ" = (
-/obj/structure/closet/firecloset,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/obj/structure/grille,
+/turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "btK" = (
 /obj/machinery/hologram/holopad,
@@ -89955,10 +89949,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
-"oEG" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/space/nearstation)
 "oFL" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -142043,9 +142033,9 @@ cpO
 aXY
 bsr
 bsv
-btI
-btI
-btJ
+bxi
+bxi
+bvV
 bwf
 bDU
 bEc
@@ -149985,7 +149975,7 @@ abj
 aaa
 abj
 abj
-oEG
+btJ
 aaa
 ygH
 tFK
@@ -150242,7 +150232,7 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 abj
 ygH
 aJx
@@ -150499,7 +150489,7 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 ygH
 uUu
@@ -153377,7 +153367,7 @@ nlB
 aaa
 abj
 abj
-oEG
+btJ
 abj
 abj
 csj
@@ -153891,7 +153881,7 @@ aaa
 aaa
 aaa
 abj
-oEG
+btJ
 abj
 abj
 csj
@@ -154406,7 +154396,7 @@ aaa
 aaa
 abj
 abj
-dij
+btJ
 abj
 csj
 rEQ
@@ -156439,10 +156429,10 @@ aaa
 aaa
 abj
 abj
-oEG
-oEG
-oEG
-oEG
+btJ
+btJ
+btJ
+btJ
 abj
 abj
 fhF
@@ -156701,7 +156691,7 @@ aaa
 abj
 abj
 aaa
-oEG
+btJ
 fhF
 fhF
 fhF
@@ -156711,7 +156701,7 @@ fhF
 fhF
 abj
 abj
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -156955,10 +156945,10 @@ aaa
 abj
 abj
 abj
-oEG
-oEG
-oEG
-oEG
+btJ
+btJ
+btJ
+btJ
 fhF
 fhF
 fhF
@@ -156968,7 +156958,7 @@ fhF
 fhF
 abj
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -157225,7 +157215,7 @@ fhF
 fhF
 abj
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -157472,7 +157462,7 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 fhF
 fhF
 fhF
@@ -157480,9 +157470,9 @@ fhF
 fhF
 fhF
 fhF
-oEG
+btJ
 abj
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -157723,13 +157713,13 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 fhF
 fhF
 fhF
@@ -157737,7 +157727,7 @@ fhF
 fhF
 fhF
 fhF
-oEG
+btJ
 abj
 abj
 aaa
@@ -157980,20 +157970,20 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
 aaa
 aaa
 bPS
-oEG
-oEG
+btJ
+btJ
 abj
 bPS
 abj
-oEG
-oEG
+btJ
+btJ
 bPS
 aaa
 aaa
@@ -158237,7 +158227,7 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -158502,11 +158492,11 @@ aaa
 aaa
 aaa
 aaa
-oEG
-oEG
-oEG
-oEG
-oEG
+btJ
+btJ
+btJ
+btJ
+btJ
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index ee2fd6fcf58..2ca0b9d4e83 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -60855,7 +60855,7 @@
 "ivU" = (
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
-/area/space/nearstation)
+/area/station/science/xenobiology)
 "ivY" = (
 /obj/structure/table/wood,
 /obj/machinery/newscaster{
@@ -77470,7 +77470,7 @@
 "qnJ" = (
 /obj/structure/sign/biohazard,
 /turf/simulated/wall/r_wall,
-/area/space/nearstation)
+/area/station/science/xenobiology)
 "qnY" = (
 /obj/machinery/light/small,
 /obj/structure/window/plasmareinforced{
@@ -81248,10 +81248,6 @@
 	icon_state = "whiteblue"
 	},
 /area/station/command/office/cmo)
-"sjS" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/engine,
-/area/space/nearstation)
 "sjV" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -134235,7 +134231,7 @@ qnJ
 uQm
 jAZ
 uQm
-bre
+uQm
 abq
 abq
 abq
@@ -134488,11 +134484,11 @@ aaa
 aaD
 aaa
 aaa
-bre
+uQm
 fbt
 sKz
 uXo
-bre
+uQm
 aaa
 aaa
 aaa
@@ -134745,11 +134741,11 @@ aaa
 aaa
 aaa
 aaa
-bre
+uQm
 wSy
 kcb
 njV
-bre
+uQm
 aaa
 aaa
 aaa
@@ -135002,11 +134998,11 @@ aaa
 aaa
 aaa
 aaa
-bre
+uQm
 gMG
 lQx
 xml
-bre
+uQm
 aaa
 aaa
 aaa
@@ -135259,11 +135255,11 @@ laH
 abq
 qnJ
 ivU
-bre
+uQm
 cZr
 jek
 cZr
-bre
+uQm
 ivU
 qnJ
 abq
@@ -135514,7 +135510,7 @@ aaa
 laH
 aaa
 aaa
-bre
+uQm
 fcb
 gMT
 kls
@@ -135522,7 +135518,7 @@ xPh
 gbz
 kvh
 cEn
-bre
+uQm
 aaa
 aaa
 laH
@@ -136285,7 +136281,7 @@ abq
 abq
 abq
 abq
-bre
+uQm
 eus
 gSu
 tau
@@ -136293,7 +136289,7 @@ olg
 vKU
 pji
 lcO
-bre
+uQm
 abq
 abq
 abq
@@ -136539,10 +136535,10 @@ laH
 aaa
 aaa
 aaa
-bre
-bre
-bre
-bre
+uQm
+uQm
+uQm
+uQm
 uQm
 gzU
 iUe
@@ -136550,10 +136546,10 @@ cDI
 mCu
 erC
 uQm
-bre
-bre
-bre
-bre
+uQm
+uQm
+uQm
+uQm
 aaa
 aaa
 aaa
@@ -136796,7 +136792,7 @@ laH
 aaa
 aaa
 aaa
-sjS
+wCn
 mdi
 ucO
 mdi
@@ -136810,7 +136806,7 @@ izh
 mdi
 ucO
 mdi
-sjS
+wCn
 aaa
 aaa
 aaa
@@ -137053,7 +137049,7 @@ laH
 aaa
 aaa
 aaa
-sjS
+wCn
 mdi
 cIP
 mdi
@@ -137067,7 +137063,7 @@ wDf
 mdi
 cIP
 mdi
-sjS
+wCn
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index 148e7d58652..91798580432 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -93900,7 +93900,7 @@
 "xcc" = (
 /obj/structure/girder,
 /obj/structure/grille,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "xcn" = (
 /obj/effect/turf_decal/stripes/line,
diff --git a/code/modules/unit_tests/map_tests.dm b/code/modules/unit_tests/map_tests.dm
index bb6cfc3264b..b7db5ca8f3f 100644
--- a/code/modules/unit_tests/map_tests.dm
+++ b/code/modules/unit_tests/map_tests.dm
@@ -109,3 +109,18 @@
 /datum/map_per_tile_test/structures_in_farspace_checker/CheckTile(turf/T)
 	if(T.loc.type == /area/space && locate(/obj/structure) in T.contents)
 		Fail(T, "tile contains at least one structure found in non-near space area")
+
+/datum/map_per_tile_test/nearspace_checker
+	var/allowed_turfs = list(/turf/space,
+		/turf/simulated/floor/plating/airless,
+		/turf/simulated/floor/plasteel/airless,
+		/turf/simulated/wall
+	)
+
+/datum/map_per_tile_test/nearspace_checker/New()
+	..()
+	allowed_turfs = typecacheof(allowed_turfs)
+
+/datum/map_per_tile_test/nearspace_checker/CheckTile(turf/T)
+	if(T.loc.type == /area/space/nearstation && !is_type_in_list(T, allowed_turfs))
+		Fail(T, "nearspace area contains a non-space turf: [T], ([T.type])")