diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 2708d4719af..6265006c039 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -463,9 +463,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"akZ" = ( -/turf/closed/mineral/random/stationside, -/area/space) "alb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -646,13 +643,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"apj" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space) "apk" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_red{ @@ -8202,10 +8192,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/engineering/supermatter/room) -"dbY" = ( -/obj/structure/railing, -/turf/open/space/basic, -/area/space) "dbZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10928,12 +10914,6 @@ /obj/structure/broken_flooring/singular/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"eeq" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "eeD" = ( /obj/structure/showcase/cyborg/old{ pixel_y = 20 @@ -17631,9 +17611,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/security/brig/entrance) -"gvY" = ( -/turf/closed/wall/r_wall, -/area/space) "gwa" = ( /obj/structure/chair{ dir = 1 @@ -20128,12 +20105,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/fore/greater) -"hhZ" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "hic" = ( /obj/machinery/holopad, /turf/open/floor/wood/large, @@ -29587,7 +29558,7 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/passive_vent, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "kgw" = ( /obj/machinery/door/airlock{ name = "Gambling Den" @@ -45812,10 +45783,6 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) -"pqa" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/space/basic, -/area/space) "pqm" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage/tcomms) @@ -70027,10 +69994,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"wPf" = ( -/obj/item/clothing/glasses/blindfold, -/turf/open/space/basic, -/area/space) "wPh" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -72682,10 +72645,6 @@ /obj/structure/broken_flooring/pile/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"xza" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/space/basic, -/area/space) "xzd" = ( /obj/structure/lattice, /obj/structure/railing/corner, @@ -84623,7 +84582,7 @@ wBo giq wBo vmL -apj +hZf kwH nID vmL @@ -84905,12 +84864,12 @@ brC brC pfx ybO -akZ -akZ -akZ -akZ -akZ -akZ +aJq +aJq +aJq +aJq +aJq +aJq gcs blb blb @@ -93768,7 +93727,7 @@ dDB dDB dDB dDB -dbY +qyN kgu wOl dby @@ -94025,8 +93984,8 @@ dDB dDB dDB dDB -eeq -hhZ +rMm +uPX fSf wRa xXJ @@ -100587,7 +100546,7 @@ xvT fAx fVU xvT -gvY +xvT blb blb blb @@ -104009,8 +103968,8 @@ llC rbO llP xQa -pqa -pqa +xep +xep tFQ vLc xrC @@ -104523,8 +104482,8 @@ tCZ gUk rgK geu -xza -xza +xuF +xuF xSO iTR pox @@ -135310,7 +135269,7 @@ dDB dDB dDB dDB -wPf +dDB dDB dDB dDB @@ -135374,7 +135333,7 @@ dDB dDB dDB dDB -akZ +aJq aJq aJq tYT diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ea6076af43a..ba81410424e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3024,10 +3024,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"aKU" = ( -/obj/structure/sign/warning/electric_shock/directional/west, -/turf/open/space/basic, -/area/space) "aLv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13195,7 +13191,7 @@ "djY" = ( /obj/structure/sign/warning/secure_area/directional/east, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "dka" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -15968,7 +15964,7 @@ pixel_y = -32 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "dUb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28631,7 +28627,7 @@ "haF" = ( /obj/structure/sign/warning/secure_area/directional/west, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "haG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -40172,9 +40168,9 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "jUT" = ( -/obj/structure/lattice, +/obj/structure/sign/warning/electric_shock/directional/west, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "jUU" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -54408,7 +54404,7 @@ "nET" = ( /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "nEZ" = ( /turf/closed/wall/r_wall, /area/station/security/mechbay) @@ -58270,7 +58266,7 @@ dir = 8 }, /turf/open/space, -/area/space/nearstation) +/area/space) "oFC" = ( /obj/machinery/airalarm/directional/west, /obj/structure/tank_dispenser, @@ -64038,7 +64034,7 @@ dir = 10 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "pZc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75785,7 +75781,7 @@ /obj/structure/lattice, /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "sVC" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 @@ -84087,7 +84083,7 @@ "uXF" = ( /obj/structure/sign/warning/secure_area/directional/south, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "uXK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -90158,7 +90154,7 @@ dir = 10 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "wzb" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -132168,7 +132164,7 @@ gqm qYo aaa lvw -jUT +qYo qYo aaa aaa @@ -151857,7 +151853,7 @@ aaa qYo aaa qYo -aKU +jUT qYo aaa qYo @@ -154672,13 +154668,13 @@ gJk aaa aad aaa -aKU +jUT aad aaa aad aaa aad -aKU +jUT aaa qYo aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1713d378431..842768eb8ac 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -4234,7 +4234,7 @@ "bxr" = ( /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bxE" = ( /obj/machinery/camera/directional/south{ c_tag = "Chemistry South"; @@ -7986,7 +7986,7 @@ use_power = 0 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cTl" = ( /obj/structure/table/glass, /obj/item/reagent_containers/syringe, @@ -16008,7 +16008,7 @@ "fIR" = ( /obj/structure/sign/warning/secure_area/directional/north, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "fIS" = ( /obj/machinery/airalarm/directional/south, /obj/structure/disposalpipe/segment{ @@ -16992,7 +16992,7 @@ pixel_x = 32 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "gdb" = ( /turf/closed/wall/r_wall, /area/station/security/range) @@ -18476,12 +18476,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/service/chapel/funeral) -"gFb" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/space/basic, -/area/space) "gFd" = ( /obj/machinery/power/terminal, /obj/machinery/light/small/directional/east, @@ -29608,7 +29602,7 @@ "ktw" = ( /obj/structure/sign/warning/electric_shock/directional/north, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "ktz" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -36556,7 +36550,7 @@ dir = 4 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "mWA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39000,7 +38994,7 @@ "nLZ" = ( /obj/item/toy/beach_ball/branded, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "nMf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39519,12 +39513,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"nWF" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "nWS" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/space, @@ -55888,7 +55876,7 @@ "tLb" = ( /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "tLc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -58312,7 +58300,7 @@ use_power = 0 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "uzJ" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -66741,7 +66729,7 @@ "xtw" = ( /obj/item/stack/rods, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "xtz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -95199,7 +95187,7 @@ aaa aaa aaa aaa -nWF +sKY aaa sIe gkn @@ -116078,7 +116066,7 @@ twf lMJ lMJ blx -gFb +hHO aaa aaa fuu @@ -117363,7 +117351,7 @@ oAQ lMJ lMJ blx -gFb +hHO aaa aaa fuu @@ -118391,7 +118379,7 @@ oAQ lMJ lMJ blx -gFb +hHO aaa aaa aaa diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 3e9ca400480..5f46109d417 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -214,7 +214,7 @@ dir = 8 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "acp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -3428,7 +3428,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "aTU" = ( /obj/effect/turf_decal/trimline/purple/line, /obj/effect/turf_decal/trimline/purple/line{ @@ -7212,7 +7212,7 @@ dir = 4 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bOq" = ( /obj/machinery/door/airlock/maintenance/external, /obj/effect/turf_decal/stripes/line{ @@ -12687,7 +12687,7 @@ dir = 4 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "djd" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -12794,7 +12794,7 @@ dir = 4 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "dks" = ( /obj/structure/girder, /obj/item/stack/sheet/iron, @@ -21263,9 +21263,6 @@ /obj/structure/stairs/north, /turf/open/floor/iron/white/small, /area/station/medical/chemistry) -"fCp" = ( -/turf/open/floor/plating/airless, -/area/space) "fCq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/generic_maintenance_landmark, @@ -61351,7 +61348,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "pNW" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -65624,7 +65621,7 @@ dir = 8 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "qRW" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -72507,7 +72504,7 @@ c_tag = "Minisat - Aft" }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "sLe" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -74564,7 +74561,7 @@ "tlJ" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "tlK" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -78305,7 +78302,7 @@ "ujI" = ( /obj/structure/railing, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "ujQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -85593,7 +85590,7 @@ dir = 1 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "wci" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -90446,7 +90443,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "xlu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90653,6 +90650,9 @@ }, /turf/open/floor/grass, /area/station/service/hydroponics/garden/abandoned) +"xpw" = ( +/turf/open/space/basic, +/area/space/nearstation) "xpA" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -92223,6 +92223,9 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/starboard) +"xIV" = ( +/turf/open/space/openspace, +/area/space/nearstation) "xJk" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green/full, @@ -92346,7 +92349,7 @@ "xKt" = ( /obj/structure/railing/corner, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "xKy" = ( /obj/machinery/modular_computer/preset/id{ dir = 8 @@ -93031,7 +93034,7 @@ dir = 1 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "xUB" = ( /obj/machinery/light/floor, /turf/open/floor/iron/dark/side{ @@ -147072,15 +147075,15 @@ owI owI owI aTO -fCp +rcO pNV aTO -fCp -fCp +rcO +rcO xln aTO -fCp -fCp +rcO +rcO xln teq teq @@ -147121,15 +147124,15 @@ iSU iSU iSU iSU -fCp -fCp +rcO +rcO xln aTO -fCp -fCp +rcO +rcO xln aTO -fCp +rcO pNV aTO owI @@ -147329,16 +147332,16 @@ owI owI owI owI -fCp -fCp +rcO +rcO owI -fCp -fCp -fCp +rcO +rcO +rcO owI -fCp -fCp -fCp +rcO +rcO +rcO owI owI owI @@ -147378,16 +147381,16 @@ owI owI owI owI -fCp -fCp -fCp +rcO +rcO +rcO owI -fCp -fCp -fCp +rcO +rcO +rcO owI -fCp -fCp +rcO +rcO owI owI owI @@ -147589,6 +147592,13 @@ owI owI owI owI +xpw +xpw +xpw +owI +xpw +xpw +xpw owI owI owI @@ -147628,20 +147638,13 @@ owI owI owI owI +xpw +xpw +xpw owI -owI -owI -owI -owI -owI -owI -owI -owI -owI -owI -owI -owI -owI +xpw +xpw +xpw owI owI owI @@ -174625,7 +174628,7 @@ oyh oyh oyh oyh -ucA +xIV ucA ucA ucA @@ -174882,7 +174885,7 @@ oyh oyh oyh oyh -ucA +xIV ucA ucA ucA @@ -175139,7 +175142,7 @@ oyh oyh oyh oyh -ucA +xIV ucA ucA ucA @@ -175396,7 +175399,7 @@ oyh oyh oyh oyh -ucA +xIV ucA ucA ucA @@ -175653,7 +175656,7 @@ oyh oyh oyh oyh -ucA +xIV ucA ucA ucA @@ -175910,7 +175913,7 @@ oyh oyh oyh oyh -ucA +xIV ucA ucA ucA diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index c7686749c50..73f09037879 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3584,10 +3584,6 @@ }, /turf/open/floor/iron, /area/station/security/processing) -"avE" = ( -/obj/structure/lattice, -/turf/open/space/openspace, -/area/space/nearstation) "avG" = ( /obj/structure/chair{ dir = 1 @@ -26408,7 +26404,7 @@ dir = 8 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "ixO" = ( /obj/structure/chair/comfy/brown{ dir = 8; @@ -37178,7 +37174,7 @@ c_tag = "Secure - AI Lower External North" }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "mbk" = ( /obj/effect/turf_decal/sand, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -47097,10 +47093,6 @@ /obj/machinery/light/floor, /turf/open/floor/grass, /area/station/science/lower) -"pHM" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "pHX" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 1 @@ -53758,7 +53750,7 @@ /area/station/medical/storage) "rYE" = ( /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "rYL" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -54282,7 +54274,7 @@ dir = 5 }, /turf/open/floor/iron/airless, -/area/space) +/area/space/nearstation) "siZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58291,9 +58283,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"tCf" = ( -/turf/open/misc/asteroid/airless, -/area/space) "tCi" = ( /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) @@ -67472,7 +67461,7 @@ "wIP" = ( /obj/structure/lattice, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "wIT" = ( /obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70431,7 +70420,7 @@ "xRm" = ( /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "xRn" = ( /turf/open/floor/plating, /area/station/hallway/secondary/service) @@ -87662,10 +87651,10 @@ jcT jcT ncE aek -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm fYW vXM vXM @@ -89462,10 +89451,10 @@ ncE jcT jcT aek -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm fYW vXM vXM @@ -92290,10 +92279,10 @@ jcT jcT ncE aek -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm fYW fYW fYW @@ -92550,7 +92539,7 @@ aac aac aac vXM -pHM +xRm vXM vXM vXM @@ -92560,7 +92549,7 @@ vXM vXM vXM vXM -pHM +xRm fYW fYW fYW @@ -92807,7 +92796,7 @@ aac aac aac vXM -pHM +xRm vXM vXM vXM @@ -92817,14 +92806,14 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM vXM vXM vXM -pHM +xRm vXM fYW vXM @@ -93064,9 +93053,9 @@ jcT jcT aac aek -pHM -pHM -pHM +xRm +xRm +xRm rWa vXM vXM @@ -93074,14 +93063,14 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -93325,12 +93314,12 @@ vXM rWa vXM qdd -pHM -pHM +xRm +xRm rWa -pHM -pHM -pHM +xRm +xRm +xRm rWa vXM vXM @@ -93338,7 +93327,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -93589,17 +93578,17 @@ vXM rWa vXM qdd -pHM -pHM +xRm +xRm rWa -pHM -pHM -pHM +xRm +xRm +xRm rWa -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm fYW vXM vXM @@ -94606,12 +94595,12 @@ ncE ncE aac aek -pHM -pHM -pHM +xRm +xRm +xRm rWa -pHM -pHM +xRm +xRm qdd vXM rWa @@ -94866,16 +94855,16 @@ aac aac vXM vXM -pHM +xRm vXM vXM rWa -pHM -pHM -pHM +xRm +xRm +xRm rWa -pHM -pHM +xRm +xRm qdd vXM rWa @@ -95123,25 +95112,25 @@ aac aac aac aac -pHM +xRm vXM vXM vXM vXM vXM vXM -pHM +xRm vXM vXM rWa -pHM -pHM -pHM +xRm +xRm +xRm rWa -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm fYW vXM vXM @@ -95387,14 +95376,14 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -95651,7 +95640,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -95908,7 +95897,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -96165,7 +96154,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -97942,9 +97931,9 @@ aak aak aak aak -pHM -pHM -pHM +xRm +xRm +xRm aak aak aak @@ -98976,7 +98965,7 @@ aeL aeL aeL aeJ -pHM +xRm aak aaN igy @@ -99223,7 +99212,7 @@ vOU ney vNH aen -pHM +xRm aey aey aey @@ -99233,7 +99222,7 @@ aeL aeL aeL aeH -pHM +xRm aak aak amq @@ -99480,7 +99469,7 @@ dnE ney vNH aak -pHM +xRm aey aey aey @@ -99490,7 +99479,7 @@ aeL aeL aeL aeJ -pHM +xRm aak aaN igy @@ -99747,7 +99736,7 @@ aeL aeL aeL aeH -pHM +xRm aak aaa aaa @@ -100004,7 +99993,7 @@ aeL aeL aeL aeJ -pHM +xRm aak aaa aaa @@ -100138,19 +100127,19 @@ vXM vXM vXM cAd -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm aai aac aac @@ -101683,19 +101672,19 @@ vXM vXM vXM cAd -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm aai aac aac @@ -104112,7 +104101,7 @@ kgg eEp hzQ qHs -pHM +xRm aeV aeV prq @@ -105135,7 +105124,7 @@ mfB qga exl oNq -pHM +xRm ahD fKg hVy @@ -107191,7 +107180,7 @@ ssw fja cPD oNq -pHM +xRm ahD gMi hNI @@ -107346,9 +107335,9 @@ vXM vXM vXM fYW -pHM -pHM -pHM +xRm +xRm +xRm aac aam hlS @@ -107460,8 +107449,8 @@ aaa aaa aac aai -pHM -pHM +xRm +xRm rge vXM vXM @@ -107705,7 +107694,7 @@ wIY pKo vaK hZr -pHM +xRm fjQ fjQ fjQ @@ -107962,7 +107951,7 @@ hZr hZr lCk hZr -pHM +xRm hZr vXM mQi @@ -108199,19 +108188,19 @@ aaa abM abM wQP -pHM +xRm oFH -pHM +xRm bWv -pHM +xRm oFH -pHM +xRm bWv -pHM +xRm oFH -pHM +xRm bWv -pHM +xRm oFH nYX jUW @@ -108219,7 +108208,7 @@ mHw orh uxn oNq -pHM +xRm hZr aaa oEf @@ -108229,8 +108218,8 @@ aac aac vXM vXM -pHM -pHM +xRm +xRm rge vXM vXM @@ -108997,8 +108986,8 @@ hYn aac aac vXM -pHM -pHM +xRm +xRm rge vXM vXM @@ -109403,9 +109392,9 @@ vXM vXM vXM fYW -pHM -pHM -pHM +xRm +xRm +xRm aac aam hlS @@ -110939,12 +110928,12 @@ vXM fYW vXM vXM -pHM +xRm vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -111196,12 +111185,12 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM vXM -pHM +xRm vXM vXM aac @@ -111453,12 +111442,12 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM vXM -pHM +xRm vXM vXM aac @@ -111706,18 +111695,18 @@ vXM vXM vXM fYW -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm bwp -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm bwp -pHM +xRm aai aac aac @@ -113248,20 +113237,20 @@ vXM vXM vXM fYW -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm bwp -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm bwp -pHM -pHM -pHM +xRm +xRm +xRm aai hlS hlS @@ -113509,14 +113498,14 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM vXM vXM vXM -pHM +xRm vXM vXM aac @@ -113766,14 +113755,14 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM vXM vXM vXM -pHM +xRm vXM vXM aac @@ -114023,14 +114012,14 @@ vXM fYW vXM vXM -pHM +xRm vXM vXM vXM vXM vXM vXM -pHM +xRm vXM vXM aac @@ -115573,9 +115562,9 @@ vXM vXM vXM fYW -pHM -pHM -pHM +xRm +xRm +xRm aac aac aam @@ -117630,9 +117619,9 @@ vXM vXM vXM fYW -pHM -pHM -pHM +xRm +xRm +xRm aac aac aac @@ -117762,7 +117751,7 @@ vXM rxw rxw vXM -pHM +xRm vXM vXM vXM @@ -117773,7 +117762,7 @@ vXM vXM vXM vXM -pHM +xRm vXM rxw rxw @@ -118019,7 +118008,7 @@ rxw rxw vXM vXM -pHM +xRm oqp oqp oqp @@ -118030,7 +118019,7 @@ oqp oqp oqp oqp -pHM +xRm vXM vXM rxw @@ -118528,7 +118517,7 @@ vXM vXM vXM vXM -pHM +xRm vXM oqp oqp @@ -118805,7 +118794,7 @@ mYt oqp oqp oqp -pHM +xRm rxw vXM vXM @@ -119537,22 +119526,22 @@ aaa aaa aaa aaa -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm xvl xvl xvl @@ -120048,25 +120037,25 @@ vwd pRm pRm pRm -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm dBj wXI jqs @@ -120498,8 +120487,8 @@ aac aac aac aai -pHM -pHM +xRm +xRm vle aaS aaa @@ -120562,25 +120551,25 @@ aGY pRm pRm pRm -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm dBj fMK fMK @@ -121074,27 +121063,27 @@ hJl iix iix iix -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm +xRm xvl xvl xvl @@ -121889,7 +121878,7 @@ mYt oqp oqp oqp -pHM +xRm rxw vXM vXM @@ -122075,7 +122064,7 @@ dfz mpd lEt glc -pHM +xRm pAT cHH bNp @@ -122126,7 +122115,7 @@ vXM vXM vXM vXM -pHM +xRm vXM oqp oqp @@ -122332,7 +122321,7 @@ dfz txW iMt glc -pHM +xRm hkN gIj loa @@ -122645,7 +122634,7 @@ rxw rxw vXM vXM -pHM +xRm oqp oqp oqp @@ -122656,7 +122645,7 @@ oqp oqp oqp oqp -pHM +xRm vXM vXM rxw @@ -122902,7 +122891,7 @@ vXM rxw rxw vXM -pHM +xRm vXM vXM vXM @@ -122913,7 +122902,7 @@ vXM vXM vXM vXM -pHM +xRm vXM rxw rxw @@ -123067,11 +123056,11 @@ aaP aaQ aac aaS -pHM -pHM -pHM -pHM -pHM +xRm +xRm +xRm +xRm +xRm aaS aaa aaa @@ -123320,7 +123309,7 @@ vXM vXM vXM vXM -pHM +xRm aaH aac aac @@ -123569,7 +123558,7 @@ aaa aaa aaa aaH -pHM +xRm vXM vXM vXM @@ -123577,7 +123566,7 @@ vXM vXM vXM vXM -pHM +xRm aaH aac aac @@ -123826,7 +123815,7 @@ aaa aaa aaa aaI -pHM +xRm vXM vXM vXM @@ -123834,7 +123823,7 @@ vXM vXM vXM vXM -pHM +xRm aaI aac aac @@ -124083,7 +124072,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -124091,7 +124080,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM aac @@ -124340,7 +124329,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -124348,7 +124337,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM aac @@ -124597,7 +124586,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -124605,7 +124594,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -124854,7 +124843,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -124862,7 +124851,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125111,7 +125100,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125119,7 +125108,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125368,7 +125357,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125376,7 +125365,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125419,9 +125408,9 @@ aac aac aac aac -pHM +xRm vXM -pHM +xRm aac aac vXM @@ -125625,7 +125614,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125633,7 +125622,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125676,9 +125665,9 @@ vXM aac aac aac -pHM +xRm vXM -pHM +xRm aac aac vXM @@ -125882,7 +125871,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125890,7 +125879,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -125933,9 +125922,9 @@ vXM vXM aac vXM -pHM +xRm vXM -pHM +xRm aac vXM vXM @@ -126139,7 +126128,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126147,7 +126136,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126190,9 +126179,9 @@ vXM vXM vXM vXM -pHM -pHM -pHM +xRm +xRm +xRm vXM vXM vXM @@ -126396,7 +126385,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126404,7 +126393,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126447,9 +126436,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -126653,7 +126642,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126661,7 +126650,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126704,9 +126693,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -126910,7 +126899,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126918,7 +126907,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -126961,9 +126950,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -127167,7 +127156,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -127175,7 +127164,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -127218,9 +127207,9 @@ vXM vXM vXM vXM -pHM -pHM -pHM +xRm +xRm +xRm vXM vXM vXM @@ -127424,7 +127413,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -127432,7 +127421,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -127475,9 +127464,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -127681,7 +127670,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -127689,7 +127678,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -127732,9 +127721,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -127938,7 +127927,7 @@ vXM vXM vXM vXM -pHM +xRm vXM vXM vXM @@ -127989,9 +127978,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -128246,9 +128235,9 @@ vXM vXM vXM vXM -pHM -pHM -pHM +xRm +xRm +xRm vXM vXM vXM @@ -128503,9 +128492,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM fjj vXM @@ -128760,9 +128749,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -129017,9 +129006,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -129274,9 +129263,9 @@ vXM vXM vXM vXM -pHM -pHM -pHM +xRm +xRm +xRm vXM vXM vXM @@ -129531,9 +129520,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -129788,9 +129777,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -130045,9 +130034,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -130302,9 +130291,9 @@ vXM vXM vXM vXM -pHM -pHM -pHM +xRm +xRm +xRm vXM vXM vXM @@ -130559,9 +130548,9 @@ vXM vXM vXM vXM -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -130816,9 +130805,9 @@ vXM aaa aaa aaa -pHM +xRm vXM -pHM +xRm vXM vXM vXM @@ -131073,9 +131062,9 @@ aaa aaa aaa aaa -pHM +xRm vXM -pHM +xRm vXM vXM aaa @@ -139256,7 +139245,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -139513,7 +139502,7 @@ pMW pMW cAd pMW -avE +wIP pMW pMW pMW @@ -139533,7 +139522,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -139768,9 +139757,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -139790,7 +139779,7 @@ pMW pMW pMW pMW -avE +wIP pMW cAd pMW @@ -140025,9 +140014,9 @@ pMW pMW pMW pMW -avE -avE -avE +wIP +wIP +wIP pMW pMW pMW @@ -140047,9 +140036,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -140284,7 +140273,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -140304,9 +140293,9 @@ pMW pMW pMW pMW -avE -avE -avE +wIP +wIP +wIP pMW pMW pMW @@ -140541,7 +140530,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -140561,7 +140550,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -140798,7 +140787,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -140818,7 +140807,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -141055,7 +141044,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -141075,7 +141064,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -141826,7 +141815,7 @@ pMW pMW pMW pMW -pHM +xRm pMW pMW pMW @@ -141846,7 +141835,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -142083,7 +142072,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -142103,7 +142092,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -142854,8 +142843,8 @@ pMW pMW pMW pMW -avE -avE +wIP +wIP rOy rOy oKl @@ -142873,8 +142862,8 @@ pMW oKl rOy rOy -avE -avE +wIP +wIP pMW pMW pMW @@ -143115,7 +143104,7 @@ oKl pMW pMW pMW -avE +wIP pMW pMW pMW @@ -143127,7 +143116,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -143629,7 +143618,7 @@ oKl pMW pMW pMW -avE +wIP pMW pMW pMW @@ -143641,7 +143630,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -143882,8 +143871,8 @@ pMW pMW pMW pMW -avE -pHM +wIP +xRm rOy rOy rOy @@ -143901,8 +143890,8 @@ oKl rOy rOy rOy -pHM -avE +xRm +wIP pMW pMW pMW @@ -143913,7 +143902,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -144170,7 +144159,7 @@ pMW oKl rOy rOy -pHM +xRm rOy rOy pMW @@ -144401,7 +144390,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -144411,7 +144400,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -144424,12 +144413,12 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -144653,12 +144642,12 @@ pMW pMW pMW pMW -avE +wIP tPE tPE tPE tPE -avE +wIP pMW pMW pMW @@ -144668,12 +144657,12 @@ pMW pMW pMW pMW -avE +wIP tPE tPE tPE tPE -avE +wIP pMW pMW pMW @@ -144681,12 +144670,12 @@ pMW pMW pMW pMW -avE +wIP tPE tPE tPE tPE -avE +wIP pMW pMW pMW @@ -144910,7 +144899,7 @@ oKl oKl oKl oKl -avE +wIP tPE qnv tld @@ -144930,7 +144919,7 @@ nmY cPH dfL nmY -avE +wIP pMW pMW pMW @@ -144938,7 +144927,7 @@ pMW pMW pMW pMW -avE +wIP nmY hng xnH @@ -145162,7 +145151,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -145419,7 +145408,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -153448,10 +153437,10 @@ jFJ aHp qgS jFJ -avE -avE -avE -avE +wIP +wIP +wIP +wIP pMW pMW pMW @@ -153962,10 +153951,10 @@ jYe gnr bIJ jFJ -avE -avE -avE -avE +wIP +wIP +wIP +wIP pMW pMW pMW @@ -156789,8 +156778,8 @@ vCZ wAA vCZ vCZ -avE -avE +wIP +wIP esT mAG tMW @@ -156798,9 +156787,9 @@ byH tMW tMW esT -avE -avE -avE +wIP +wIP +wIP kFx pMW pMW @@ -157817,8 +157806,8 @@ aaa aaa aaa aai -avE -avE +wIP +wIP esT tMW tMW @@ -157826,10 +157815,10 @@ sOg mAG mAG esT -avE -avE -avE -avE +wIP +wIP +wIP +wIP kFx kFx kFx @@ -158086,7 +158075,7 @@ sdb pMW pMW pMW -avE +wIP pMW pMW pMW @@ -158096,7 +158085,7 @@ pMW pMW pMW pMW -avE +wIP kFx kFx kFx @@ -158343,7 +158332,7 @@ sdb pMW pMW pMW -avE +wIP pMW pMW pMW @@ -158353,14 +158342,14 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW pMW pMW pMW -avE +wIP pMW kFx pMW @@ -158610,14 +158599,14 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -158874,7 +158863,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -159132,10 +159121,10 @@ sdb sdb sdb esT -avE -avE -avE -avE +wIP +wIP +wIP +wIP kFx pMW pMW @@ -160674,10 +160663,10 @@ sdb sdb sdb esT -avE -avE -avE -avE +wIP +wIP +wIP +wIP kFx pMW pMW @@ -160930,7 +160919,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -161187,7 +161176,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -161444,7 +161433,7 @@ pMW pMW pMW pMW -avE +wIP pMW kFx pMW @@ -172882,10 +172871,10 @@ pMW pMW pMW kFx -avE -avE -avE -avE +wIP +wIP +wIP +wIP aTY iCA fZL @@ -174939,10 +174928,10 @@ pMW pMW pMW kFx -avE -avE -avE -avE +wIP +wIP +wIP +wIP aTY iCA iCA @@ -176475,12 +176464,12 @@ pMW kFx pMW pMW -avE +wIP pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -176732,12 +176721,12 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -176989,12 +176978,12 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -177242,10 +177231,10 @@ pMW pMW pMW kFx -avE -avE -avE -avE +wIP +wIP +wIP +wIP aTY uRv uRv @@ -178784,10 +178773,10 @@ pMW pMW pMW kFx -avE -avE -avE -avE +wIP +wIP +wIP +wIP aTY uRv uRv @@ -179045,14 +179034,14 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -179302,14 +179291,14 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -179559,14 +179548,14 @@ pMW kFx pMW pMW -avE +wIP pMW pMW pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -181109,11 +181098,11 @@ pMW pMW pMW kFx -avE -avE -avE -avE -avE +wIP +wIP +wIP +wIP +wIP aTY iCA iCA @@ -183166,12 +183155,12 @@ pMW pMW pMW kFx -avE -avE -avE -avE -avE -avE +wIP +wIP +wIP +wIP +wIP +wIP aTY iCA fZL @@ -183300,14 +183289,14 @@ rxw rxw pMW pMW -avE +wIP pMW pMW pMW bGh pMW pMW -avE +wIP pMW pMW rxw @@ -183809,7 +183798,7 @@ pMW pMW pMW pMW -avE +wIP pMW gFf gFf @@ -184341,7 +184330,7 @@ oMI gFf gFf gFf -avE +wIP rxw pMW pMW @@ -185072,23 +185061,23 @@ aaa aaa aaa aaS -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP vUu vUu lwj @@ -185331,7 +185320,7 @@ aaa pMW pMW pMW -avE +wIP pMW pMW pMW @@ -185341,7 +185330,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -185588,7 +185577,7 @@ aaa pMW pMW pMW -avE +wIP pMW pMW pMW @@ -185598,7 +185587,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -185842,24 +185831,24 @@ aaa aaa aaa aaS -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP xSS lwj tqN @@ -186107,7 +186096,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -186364,7 +186353,7 @@ pMW pMW pMW pMW -avE +wIP pMW pMW pMW @@ -186609,28 +186598,28 @@ aac aaa aaa aaS -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE -avE +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP +wIP vUu vUu lwj @@ -187425,7 +187414,7 @@ oMI gFf gFf gFf -avE +wIP rxw pMW pMW @@ -187921,7 +187910,7 @@ pMW pMW pMW pMW -avE +wIP pMW gFf gFf @@ -188440,14 +188429,14 @@ rxw rxw pMW pMW -avE +wIP pMW pMW pMW ylt pMW pMW -avE +wIP pMW pMW rxw @@ -190956,7 +190945,7 @@ pMW pMW pMW iLP -tCf +aac iLP pMW pMW @@ -191212,9 +191201,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -191469,9 +191458,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -191726,9 +191715,9 @@ pMW pMW pMW pMW -avE -avE -avE +wIP +wIP +wIP pMW pMW pMW @@ -191983,9 +191972,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -192240,9 +192229,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -192497,9 +192486,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -192754,9 +192743,9 @@ pMW pMW pMW pMW -avE -avE -avE +wIP +wIP +wIP pMW pMW pMW @@ -193011,9 +193000,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -193268,9 +193257,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -193525,9 +193514,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -193782,9 +193771,9 @@ pMW pMW pMW pMW -avE -avE -avE +wIP +wIP +wIP pMW pMW pMW @@ -194039,9 +194028,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -194296,9 +194285,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -194553,9 +194542,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW pMW @@ -194810,9 +194799,9 @@ pMW pMW pMW pMW -avE -avE -avE +wIP +wIP +wIP pMW pMW pMW @@ -195067,9 +195056,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP pMW pMW aaa @@ -195324,9 +195313,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP aac aaa aac @@ -195581,9 +195570,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP aac aac aac @@ -195838,9 +195827,9 @@ pMW pMW pMW pMW -avE -avE -avE +wIP +wIP +wIP aac aac aac @@ -196095,9 +196084,9 @@ pMW pMW pMW pMW -avE +wIP pMW -avE +wIP aac aac aaa @@ -196352,9 +196341,9 @@ pMW aac aac aac -avE +wIP pMW -avE +wIP aaa aaa aaa @@ -196609,9 +196598,9 @@ aac aac aac aac -avE +wIP pMW -avE +wIP aaa aaa aaa diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index d2c6cf82d7b..d90dbcb51bb 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -2042,7 +2042,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "aIc" = ( /obj/structure/table, /obj/effect/spawner/random/bureaucracy/paper, @@ -4113,10 +4113,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/station/security/detectives_office/private_investigators_office) -"bwC" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "bwQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6785,7 +6781,7 @@ /area/station/maintenance/central/lesser) "cxg" = ( /turf/open/misc/asteroid/airless, -/area/space) +/area/space/nearstation) "cxr" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -7428,7 +7424,7 @@ "cKD" = ( /mob/living/basic/mining/basilisk, /turf/open/misc/asteroid/airless, -/area/space) +/area/space/nearstation) "cLd" = ( /obj/machinery/oven/range, /obj/machinery/light/directional/north, @@ -10582,7 +10578,7 @@ "dLY" = ( /obj/structure/broken_flooring/singular/directional/east, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "dMa" = ( /obj/structure/chair/office, /obj/effect/turf_decal/tile/brown/fourcorners, @@ -11085,7 +11081,7 @@ "dUc" = ( /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "dUi" = ( /turf/closed/wall/r_wall, /area/station/engineering/lobby) @@ -11518,7 +11514,7 @@ "ebN" = ( /obj/structure/broken_flooring/pile/directional/east, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "ebP" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/effect/mapping_helpers/apc/cell_5k, @@ -14589,7 +14585,7 @@ dir = 8 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "flH" = ( /obj/structure/closet/boxinggloves, /obj/effect/landmark/start/hangover/closet, @@ -16287,6 +16283,10 @@ /obj/effect/landmark/carpspawn, /turf/open/space/openspace, /area/space) +"fOe" = ( +/obj/effect/landmark/carpspawn, +/turf/open/space/openspace, +/area/space/nearstation) "fOi" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -21447,10 +21447,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"hCu" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless, -/area/space) "hCv" = ( /obj/machinery/mech_bay_recharge_port{ dir = 2 @@ -22971,7 +22967,7 @@ /area/station/engineering/lobby) "ifd" = ( /turf/open/floor/engine/airless, -/area/space) +/area/space/nearstation) "ifj" = ( /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai_upload) @@ -28954,9 +28950,6 @@ /obj/structure/table/wood/fancy/orange, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) -"kkx" = ( -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "kkA" = ( /obj/machinery/light_switch/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -38007,10 +38000,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"nsH" = ( -/obj/structure/lattice, -/turf/open/space/openspace, -/area/space) "nsI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39170,7 +39159,7 @@ c_tag = "Secure - AI Upper External East" }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "nQs" = ( /obj/machinery/light/small/directional/north, /turf/open/misc/asteroid, @@ -39575,7 +39564,7 @@ /mob/living/basic/mothroach, /obj/item/stack/spacecash/c100, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "oaY" = ( /obj/effect/landmark/start/medical_doctor, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -41902,7 +41891,7 @@ spawn_scatter_radius = 1 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "oUm" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -43534,7 +43523,7 @@ "pwU" = ( /obj/structure/fluff/iced_abductor, /turf/open/misc/asteroid/airless, -/area/space) +/area/space/nearstation) "pwV" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -43734,7 +43723,7 @@ "pAK" = ( /obj/item/stack/cable_coil, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "pAP" = ( /obj/effect/spawner/random/food_or_drink/seed{ spawn_all_loot = 1; @@ -45726,7 +45715,7 @@ "qjk" = ( /obj/structure/broken_flooring/singular/directional/south, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "qjp" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/window/spawner/directional/north, @@ -49010,7 +48999,7 @@ c_tag = "Secure - AI Upper External South" }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "rqJ" = ( /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, @@ -59863,7 +59852,7 @@ name = "Delaminates-The-Supermatter" }, /turf/open/misc/asteroid/airless, -/area/space) +/area/space/nearstation) "vaY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/broken_flooring/pile, @@ -60156,7 +60145,7 @@ "vgW" = ( /obj/structure/lattice, /turf/open/floor/engine/airless, -/area/space) +/area/space/nearstation) "vhf" = ( /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, @@ -64366,7 +64355,7 @@ "wHl" = ( /obj/structure/girder, /turf/open/misc/asteroid/airless, -/area/space) +/area/space/nearstation) "wHo" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/spawner/random/entertainment/arcade{ @@ -64454,7 +64443,7 @@ "wJC" = ( /obj/structure/sign/poster/contraband/communist_state/directional/east, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "wJN" = ( /obj/machinery/space_heater/improvised_chem_heater, /turf/open/floor/plating, @@ -64896,7 +64885,7 @@ /area/station/hallway/primary/central) "wSj" = ( /turf/closed/mineral/asteroid, -/area/space) +/area/space/nearstation) "wSn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, @@ -73275,15 +73264,15 @@ cLf cLf iUF tLg -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc tLg iUF cLf @@ -73531,7 +73520,7 @@ cLf cLf cLf iUF -bwC +dUc wfz uuN uuN @@ -73541,7 +73530,7 @@ uuN uuN uuN wfz -bwC +dUc iUF cLf cLf @@ -73788,17 +73777,17 @@ cLf cLf cLf cLf -bwC +dUc uuN cLf cLf cLf -bwC +dUc cLf cLf cLf uuN -bwC +dUc cLf cLf cLf @@ -74045,17 +74034,17 @@ cLf cLf cLf cLf -bwC +dUc uuN cLf cLf cLf -bwC +dUc cLf cLf cLf uuN -bwC +dUc cLf cLf cLf @@ -74302,17 +74291,17 @@ cLf cLf cLf cLf -bwC +dUc uuN cLf cLf cLf -bwC +dUc cLf cLf cLf uuN -bwC +dUc cLf cLf cLf @@ -74559,17 +74548,17 @@ cLf cLf cLf cLf -bwC +dUc uuN -bwC -bwC -bwC +dUc +dUc +dUc itt -bwC -bwC -bwC +dUc +dUc +dUc uuN -bwC +dUc cLf cLf cLf @@ -74816,17 +74805,17 @@ cLf cLf cLf cLf -bwC +dUc uuN cLf cLf cLf -bwC +dUc cLf cLf cLf uuN -bwC +dUc cLf cLf cLf @@ -75073,17 +75062,17 @@ cLf cLf cLf cLf -bwC +dUc uuN cLf cLf cLf -bwC +dUc cLf cLf cLf uuN -bwC +dUc cLf cLf cLf @@ -75330,17 +75319,17 @@ cLf cLf cLf cLf -bwC +dUc uuN cLf cLf cLf -bwC +dUc cLf cLf cLf uuN -bwC +dUc cLf cLf cLf @@ -75587,7 +75576,7 @@ cLf cLf cLf iUF -bwC +dUc wfz uuN uuN @@ -75597,7 +75586,7 @@ uuN uuN uuN wfz -bwC +dUc iUF cLf cLf @@ -75845,15 +75834,15 @@ cLf cLf iUF tLg -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc tLg iUF cLf @@ -76062,16 +76051,16 @@ iUF iUF cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf iUF -bwC +dUc iUF cLf cLf @@ -76103,17 +76092,17 @@ cLf iUF iUF cLf -bwC +dUc cLf uuN uuN uuN cLf -bwC +dUc cLf iUF iUF -bwC +dUc cLf cLf cLf @@ -76319,16 +76308,16 @@ iUF cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf iUF -bwC +dUc iUF cLf cLf @@ -76360,17 +76349,17 @@ cLf cLf cLf cLf -bwC +dUc cLf uuN uuN uuN cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -76573,19 +76562,19 @@ cLf cLf cLf iUF -bwC -bwC -bwC +dUc +dUc +dUc rGO cLf qJB cLf rGO -bwC -bwC -bwC +dUc +dUc +dUc iUF -bwC +dUc iUF cLf cLf @@ -76617,22 +76606,22 @@ cLf cLf cLf cLf -bwC +dUc cLf uuN uuN uuN cLf -bwC +dUc cLf cLf cLf -bwC -bwC +dUc +dUc iUF iUF iUF -bwC +dUc cLf cLf cLf @@ -76842,7 +76831,7 @@ cLf cLf cLf iUF -bwC +dUc iUF cLf cLf @@ -76874,22 +76863,22 @@ cLf cLf cLf cLf -bwC +dUc cLf uuN uuN uuN cLf -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -77099,7 +77088,7 @@ cLf cLf cLf iUF -bwC +dUc iUF cLf cLf @@ -77131,22 +77120,22 @@ cLf cLf cLf cLf -bwC +dUc cLf uuN uuN uuN cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf kJV cLf -bwC +dUc cLf cLf cLf @@ -77356,7 +77345,7 @@ rGO cLf cLf iUF -bwC +dUc iUF cLf cLf @@ -77388,24 +77377,24 @@ cLf cLf cLf cLf -bwC +dUc cLf uuN uuN uuN cLf -bwC +dUc cLf cLf cLf iUF iUF -bwC -bwC -bwC +dUc +dUc +dUc iUF iUF -bwC +dUc mPv cLf cLf @@ -77613,7 +77602,7 @@ opZ rGO cLf iUF -bwC +dUc iUF cLf cLf @@ -77622,7 +77611,7 @@ cLf cLf cLf cLf -bwC +dUc iUF cLf cLf @@ -77639,12 +77628,12 @@ cLf cLf cLf iUF -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc iUF iUF kYn @@ -77656,18 +77645,18 @@ iUF iUF cLf cLf -bwC +dUc cLf cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -77858,7 +77847,7 @@ cLf cLf cLf iUF -bwC +dUc rGO sKL rGO @@ -77868,18 +77857,18 @@ nMk rGO sKL rGO -bwC +dUc iUF -bwC +dUc iUF -bwC -bwC +dUc +dUc iUF iUF iUF iUF -bwC -bwC +dUc +dUc cLf cLf cLf @@ -77896,7 +77885,7 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -77904,16 +77893,16 @@ cLf cLf iUF cLf -bwC +dUc cLf -bwC +dUc cLf -bwC +dUc cLf iUF cLf cLf -bwC +dUc cLf cLf cLf @@ -78127,14 +78116,14 @@ opZ opZ cLf iUF -bwC +dUc iUF cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -78153,19 +78142,19 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -78197,12 +78186,12 @@ kYn cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf shs @@ -78382,16 +78371,16 @@ nMk rGO sKL rGO -bwC +dUc iUF -bwC +dUc iUF cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -78410,19 +78399,19 @@ cLf cLf cLf tyd -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf -bwC +dUc cLf -bwC +dUc cLf cLf rnk @@ -78449,8 +78438,8 @@ shs shs kYn shs -bwC -bwC +dUc +dUc cLf cLf oDH @@ -78459,7 +78448,7 @@ oDH cLf cLf cLf -bwC +dUc cLf cLf shs @@ -78629,7 +78618,7 @@ cLf cLf cLf iUF -bwC +dUc opZ opZ opZ @@ -78641,14 +78630,14 @@ opZ fYX cLf iUF -bwC +dUc iUF cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -78667,15 +78656,15 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc rnk rnk oFu @@ -78701,13 +78690,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf oDH weu @@ -78715,10 +78704,10 @@ oDH weu oDH bfl -bwC +dUc wfz -bwC -bwC +dUc +dUc shs cLf cLf @@ -78888,24 +78877,24 @@ cLf iUF cLf cLf -bwC +dUc cLf cLf pNk cLf cLf -bwC +dUc cLf cLf iUF -bwC +dUc iUF cLf cLf cLf cLf cLf -bwC +dUc cLf tyd cLf @@ -78924,7 +78913,7 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -78958,14 +78947,14 @@ vxX vxX vxX cLf -bwC +dUc cLf cLf cLf -bwC -bwC +dUc +dUc wfz -bwC +dUc oDH weu oDH @@ -78973,7 +78962,7 @@ weu oDH lTb oDH -bwC +dUc cLf cLf shs @@ -79145,24 +79134,24 @@ cLf iUF cLf cLf -bwC +dUc cLf cLf pNk cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -79181,7 +79170,7 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -79219,9 +79208,9 @@ loh loh loh loh -bwC +dUc cLf -bwC +dUc cLf oDH weu @@ -79230,7 +79219,7 @@ weu oDH weu oDH -bwC +dUc cLf cLf shs @@ -79402,24 +79391,24 @@ cLf cLf cLf cLf -bwC +dUc cLf oyS oDZ oyS cLf -bwC +dUc tyd cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -79438,7 +79427,7 @@ cLf cLf cLf cLf -bwC +dUc cLf vxX vxX @@ -79478,8 +79467,8 @@ sRo iFz iFz iFz -bwC -bwC +dUc +dUc lTb weu lTb @@ -79665,12 +79654,12 @@ oyS hPg oyS cLf -bwC +dUc cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -79695,7 +79684,7 @@ cLf cLf cLf cLf -bwC +dUc vxX vxX vxX @@ -79746,7 +79735,7 @@ kqy kqy kqy pBk -bwC +dUc shs cLf cLf @@ -79908,7 +79897,7 @@ cLf cLf cLf mPv -bwC +dUc nAb eSS eSS @@ -79922,12 +79911,12 @@ oyS qjc oyS oyS -bwC +dUc cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -79937,10 +79926,10 @@ vxX vxX vxX cLf -bwC -bwC +dUc +dUc mfA -bwC +dUc fVZ mWe aoL @@ -79992,8 +79981,8 @@ hVs iFz iFz iFz -bwC -bwC +dUc +dUc lTb weu lTb @@ -80182,9 +80171,9 @@ poi poi poi mxq -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -80194,7 +80183,7 @@ poi poi poi cLf -bwC +dUc cLf fsI cLf @@ -80247,9 +80236,9 @@ loh loh loh loh -bwC +dUc cLf -bwC +dUc cLf oDH weu @@ -80258,7 +80247,7 @@ weu oDH weu oDH -bwC +dUc cLf cLf shs @@ -80504,10 +80493,10 @@ sHh xyN nNv rnk -bwC -bwC +dUc +dUc wfz -bwC +dUc oDH weu oDH @@ -80515,7 +80504,7 @@ weu oDH lTb oDH -bwC +dUc cLf cLf shs @@ -80771,10 +80760,10 @@ oDH weu oDH bfl -bwC +dUc wfz dUc -bwC +dUc shs cLf cLf @@ -80936,7 +80925,7 @@ cLf cLf cLf mPv -bwC +dUc nAb eSS eSS @@ -81029,7 +81018,7 @@ oDH cLf cLf cLf -bwC +dUc cLf cLf shs @@ -81281,12 +81270,12 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf shs @@ -81439,22 +81428,22 @@ cLf cLf cLf cLf -bwC +dUc iUF iUF iUF -bwC +dUc iUF iUF iUF -bwC +dUc iUF iUF iUF -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc eSS cro cro @@ -81532,11 +81521,11 @@ fma fma gtK rnk -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc kYn shs shs @@ -81692,21 +81681,21 @@ cLf cLf cLf cLf -bwC +dUc iUF iUF iUF -bwC +dUc cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -81796,7 +81785,7 @@ rnk cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -81949,21 +81938,21 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -82308,8 +82297,8 @@ uoo bMx hiO oFu -bwC -bwC +dUc +dUc iUF cLf cLf @@ -82464,7 +82453,7 @@ cLf cLf cLf iUF -bwC +dUc xrb xrb dEG @@ -82565,7 +82554,7 @@ sEY vJf rnk rnk -bwC +dUc cLf iUF cLf @@ -82737,7 +82726,7 @@ cem cem whY baH -bwC +dUc qhP dJK geh @@ -82977,7 +82966,7 @@ tyd cLf cLf cLf -bwC +dUc cLf xrb nEx @@ -83077,7 +83066,7 @@ lXG rnk cLf cLf -bwC +dUc kYn shs cLf @@ -83492,7 +83481,7 @@ cLf cLf cLf iUF -bwC +dUc xrb iNq oHi @@ -84005,7 +83994,7 @@ cLf cLf cLf cLf -bwC +dUc cLf oPe xch @@ -84105,7 +84094,7 @@ oaP oFu cLf cLf -bwC +dUc cLf cLf cLf @@ -84262,7 +84251,7 @@ cLf cLf cLf cLf -bwC +dUc vxX ubm ubm @@ -84294,10 +84283,10 @@ uZc uZc uZc uZc -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc poi poi poi @@ -84362,7 +84351,7 @@ oqj rnk vxX vxX -bwC +dUc cLf cLf cLf @@ -84558,7 +84547,7 @@ cLf cLf cLf cLf -bwC +dUc htf kpT jdK @@ -84815,7 +84804,7 @@ cLf cLf cLf cLf -bwC +dUc htf iHv rZJ @@ -85072,7 +85061,7 @@ cLf cLf cLf cLf -bwC +dUc poi mhF jdK @@ -85329,7 +85318,7 @@ cLf cLf cLf cLf -bwC +dUc poi htf poi @@ -85586,7 +85575,7 @@ uOf cLf cLf cLf -bwC +dUc iua tdq cTa @@ -85841,8 +85830,8 @@ cLf ved gxu ved -bwC -bwC +dUc +dUc poi poi poi @@ -86417,7 +86406,7 @@ paa pEZ wiK mXM -bwC +dUc gGf cLf cLf @@ -87351,8 +87340,8 @@ cLf cLf cLf cLf -bwC -bwC +dUc +dUc cLf cLf cLf @@ -87443,7 +87432,7 @@ lKh dgp paa rnk -bwC +dUc iUF cLf cLf @@ -87700,7 +87689,7 @@ dgp dgp rFd rnk -bwC +dUc iUF cLf cLf @@ -87948,10 +87937,10 @@ kJT fhL kJT cLf -bwC +dUc cLf -bwC -kkx +dUc +cxg rnk wdV nHm @@ -88125,8 +88114,8 @@ pnS pnS pnS unk -bwC -bwC +dUc +dUc jza mbM mbM @@ -88205,9 +88194,9 @@ kJT kyi kJT cLf -bwC +dUc cLf -bwC +dUc cLf rnk xuD @@ -88384,7 +88373,7 @@ pnS pnS cLf cLf -bwC +dUc uuN uuN plA @@ -88461,11 +88450,11 @@ hDK kJT iTL kJT -bwC +dUc wfz uuN wfz -bwC +dUc jsC xWi jsC @@ -88641,7 +88630,7 @@ unk cLf cLf cLf -bwC +dUc uuN uuN plA @@ -88894,10 +88883,10 @@ cLf cLf cLf cLf -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc rTM rTM rTM @@ -89235,7 +89224,7 @@ pUY kJT hgV wJC -bwC +dUc uuN gJE paa @@ -89492,7 +89481,7 @@ hYg kJT rnk rnk -bwC +dUc wfz gJE paa @@ -89749,7 +89738,7 @@ ndI kJT afV rnk -bwC +dUc uuN gJE paa @@ -90438,7 +90427,7 @@ cLf cLf cLf iUF -bwC +dUc hDo sIM wVz @@ -90780,8 +90769,8 @@ vxX vxX cLf cLf -bwC -bwC +dUc +dUc cLf cLf cLf @@ -90952,7 +90941,7 @@ cLf cLf cLf iUF -bwC +dUc hDo fmB rAu @@ -91038,7 +91027,7 @@ rnk rnk rnk rnk -bwC +dUc cLf cLf cLf @@ -92317,13 +92306,13 @@ uZx rms tcN rnk -bwC -bwC +dUc +dUc rnk rnk rnk rnk -bwC +dUc cLf cLf cLf @@ -92507,14 +92496,14 @@ axD axD axD fYe -bwC -bwC -bwC +dUc +dUc +dUc uuN uuN -bwC -bwC -bwC +dUc +dUc +dUc fYe fYe fri @@ -92576,11 +92565,11 @@ lqf rnk cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -92755,7 +92744,7 @@ cLf cLf cLf cLf -bwC +dUc cLf fZF mGX @@ -92835,9 +92824,9 @@ hzF hzF hzF hzF -bwC -bwC -bwC +dUc +dUc +dUc cLf cLf cLf @@ -93094,7 +93083,7 @@ pCJ hzF cLf cLf -bwC +dUc cLf cLf cLf @@ -93264,11 +93253,11 @@ cLf cLf cLf iUF -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc axD axD axD @@ -93278,15 +93267,15 @@ jxq vEF axD axD -bwC +dUc uuN -bwC +dUc uuN uuN -bwC +dUc uuN -bwC -bwC +dUc +dUc fYe fri nAe @@ -93536,12 +93525,12 @@ dGh jqu hrM cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf fYe fYe @@ -93793,7 +93782,7 @@ nbm iDJ hrM cLf -bwC +dUc cLf cLf cLf @@ -94035,11 +94024,11 @@ cLf cLf cLf iUF -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc axD hnE axD @@ -94290,8 +94279,8 @@ cLf cLf cLf cLf -bwC -bwC +dUc +dUc cLf cLf cLf @@ -95319,11 +95308,11 @@ cLf cLf cLf iUF -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc eKR pVC yhk @@ -96604,11 +96593,11 @@ cLf cLf cLf iUF -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc eKR cNQ kjs @@ -96692,7 +96681,7 @@ tNz nHK cLf cLf -bwC +dUc cLf cLf cLf @@ -96947,8 +96936,8 @@ xcl xrd ppk hzF -bwC -bwC +dUc +dUc wfz cLf cLf @@ -97206,7 +97195,7 @@ azg azg cLf cLf -bwC +dUc cLf cLf cLf @@ -97639,7 +97628,7 @@ cLf cLf cLf cLf -bwC +dUc cLf eKR iSE @@ -97890,13 +97879,13 @@ cLf cLf cLf iUF -bwC -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc +dUc cLf eKR tju @@ -98411,7 +98400,7 @@ cLf cLf cLf iUF -bwC +dUc eKR eKR uCw @@ -98675,13 +98664,13 @@ jVy brP jVy eKR -bwC -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc +dUc juw vOe vOe @@ -99186,10 +99175,10 @@ ili cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc dVE pjN hoe @@ -99433,8 +99422,8 @@ kGm aPz aPz xsN -bwC -bwC +dUc +dUc cLf cLf reg @@ -99518,7 +99507,7 @@ vFr vlM uEo cLf -bwC +dUc cLf cLf cLf @@ -99691,7 +99680,7 @@ oOC oOC xsN cLf -bwC +dUc cLf cLf dwF @@ -99700,7 +99689,7 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -99774,7 +99763,7 @@ mUU sLt dnt uEo -bwC +dUc iUF cLf cLf @@ -99942,7 +99931,7 @@ cLf cLf cLf iUF -bwC +dUc srs aPz aPz @@ -100222,7 +100211,7 @@ cLf iWV hJs xqe -bwC +dUc utM utM kOd @@ -100474,8 +100463,8 @@ vBs hfm eVE jEY -bwC -bwC +dUc +dUc vfJ hJs vfJ @@ -100736,7 +100725,7 @@ cLf iWV hJs iWV -bwC +dUc utM utM wWD @@ -101249,8 +101238,8 @@ cLf cLf cLf hJs -bwC -bwC +dUc +dUc obA utM utM @@ -101501,10 +101490,10 @@ eEx sYI sfY srs -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc hJs cLf cLf @@ -101739,8 +101728,8 @@ cLf cLf cLf iUF -bwC -bwC +dUc +dUc unk vxX srs @@ -101760,7 +101749,7 @@ srs srs cLf cLf -bwC +dUc cLf hqF epi @@ -102017,7 +102006,7 @@ skw srs cLf cLf -bwC +dUc cLf cLf cLf @@ -102087,7 +102076,7 @@ uFb jke kiK uFb -bwC +dUc iUF cLf cLf @@ -102274,7 +102263,7 @@ hnL srs cLf cLf -bwC +dUc cLf cLf cLf @@ -102345,7 +102334,7 @@ vBV cpF uFb cLf -bwC +dUc cLf cLf cLf @@ -102531,7 +102520,7 @@ kYu kYu cLf cLf -bwC +dUc cLf cLf cLf @@ -102787,10 +102776,10 @@ pgk ins kYu kYu -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc vxX vxX vxX @@ -103024,9 +103013,9 @@ cLf cLf cLf iUF -bwC -bwC -bwC +dUc +dUc +dUc dZy awB glq @@ -103377,7 +103366,7 @@ jge uFb cLf cLf -bwC +dUc cLf iUF cLf @@ -103862,11 +103851,11 @@ kBM nMI cLf xAy -bwC -bwC +dUc +dUc xAy cLf -bwC +dUc xAy xAy xTw @@ -104118,7 +104107,7 @@ jUU kBM pWw cLf -bwC +dUc cLf cLf uuN @@ -104149,7 +104138,7 @@ wag xzJ kub pUr -bwC +dUc iUF cLf cLf @@ -104375,7 +104364,7 @@ jUU nyQ pWw cLf -bwC +dUc cLf cLf uuN @@ -104632,7 +104621,7 @@ jUU kBM pWw cLf -bwC +dUc cLf cLf axt @@ -104890,11 +104879,11 @@ ajQ nMI cLf xAy -bwC -bwC +dUc +dUc xAy cLf -bwC +dUc xAy xAy qXB @@ -104925,7 +104914,7 @@ ruZ ruZ ruZ fmY -bwC +dUc mPv cLf cLf @@ -105953,7 +105942,7 @@ ykG ykG ykG fdj -bwC +dUc mPv vxX vxX @@ -106934,15 +106923,15 @@ niB hjI crU vxX -bwC -bwC +dUc +dUc nbu nbu nbu nbu nbu -bwC -bwC +dUc +dUc pLB dpU dpU @@ -107191,16 +107180,16 @@ pXS hjI crU vxX -bwC -bwC +dUc +dUc nbu gxw gxw cxN nbu -bwC -bwC -bwC +dUc +dUc +dUc dpU iel hTX @@ -107448,16 +107437,16 @@ niB qAI crU vxX -bwC -bwC +dUc +dUc nbu gxw puQ gxw nbu -bwC -bwC -bwC +dUc +dUc +dUc dpU nav pJw @@ -107705,16 +107694,16 @@ qOs bpy crU vxX -bwC -bwC +dUc +dUc nbu cIx enn tBt nbu -bwC -bwC -bwC +dUc +dUc +dUc dpU iPu eoQ @@ -107962,16 +107951,16 @@ niB aoA crU vxX -bwC -bwC +dUc +dUc nbu wpM wVI bvl nbu -bwC -bwC -bwC +dUc +dUc +dUc dpU ppR mZA @@ -108008,10 +107997,10 @@ pGo ykG ykG ykG -bwC -bwC +dUc +dUc fmr -bwC +dUc cLf cLf vxX @@ -108174,9 +108163,9 @@ cLf cLf cLf cLf -bwC +dUc utU -bwC +dUc cLf cLf cLf @@ -108219,16 +108208,16 @@ ers dsL crU vxX -bwC -bwC -bwC +dUc +dUc +dUc gdP -bwC +dUc mXr -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc dpU kRq kLU @@ -108264,9 +108253,9 @@ ece kcz ykG mXK -bwC -bwC -bwC +dUc +dUc +dUc fmr cLf cLf @@ -108431,9 +108420,9 @@ cLf cLf cLf cLf -bwC +dUc utU -bwC +dUc cLf cLf cLf @@ -108692,14 +108681,14 @@ qVF izr qVF wNk -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc fYe vxX vxX @@ -108727,11 +108716,11 @@ gOY vxX cxg vxX -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc cNc pNi kUb @@ -108941,9 +108930,9 @@ cLf cLf cLf cLf -bwC -bwC -bwC +dUc +dUc +dUc wZz wZz qpj @@ -108952,7 +108941,7 @@ wZz cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -109205,11 +109194,11 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -109462,7 +109451,7 @@ cLf cLf cLf cLf -bwC +dUc cLf fYe fYe @@ -109503,7 +109492,7 @@ aXt jyO qsa wVI -bwC +dUc rLK vYL jSu @@ -109719,7 +109708,7 @@ cLf cLf cLf cLf -bwC +dUc cLf vxX vxX @@ -109970,12 +109959,12 @@ cLf cLf cLf shs -bwC +dUc wfz -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc vxX vxX vxX @@ -110017,7 +110006,7 @@ nbu nbu nbu nbu -bwC +dUc utf qKj jSu @@ -110228,7 +110217,7 @@ shs shs shs cLf -bwC +dUc cLf cLf cLf @@ -110485,7 +110474,7 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -110494,7 +110483,7 @@ cLf vxX cLf cLf -bwC +dUc cLf cLf cLf @@ -110531,7 +110520,7 @@ pIV mBg rqJ wVI -bwC +dUc rLK nLD jSu @@ -110737,21 +110726,21 @@ cLf shs shs cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf cLf cLf @@ -110992,11 +110981,11 @@ cLf cLf cLf shs -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc pbP pih pbP @@ -111005,10 +110994,10 @@ pbP cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf cLf cLf @@ -111045,7 +111034,7 @@ nbu nbu nbu nbu -bwC +dUc utf hon jSu @@ -111262,10 +111251,10 @@ pih cLf cLf tyd -bwC +dUc cLf cLf -bwC +dUc cLf cLf cLf @@ -111519,10 +111508,10 @@ pih cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf cLf pkl @@ -111559,7 +111548,7 @@ msY qNM fzM wVI -bwC +dUc rLK fMS jSu @@ -111776,10 +111765,10 @@ pih cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc rXt rXt rXt @@ -111808,7 +111797,7 @@ cQu wgI vib vMR -bwC +dUc cxg vxX nbu @@ -112065,7 +112054,7 @@ miM awf egV vMR -bwC +dUc cxg vxX nbu @@ -112290,10 +112279,10 @@ pih cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc rXt rXt rXt @@ -112322,7 +112311,7 @@ nbS nbS nbS vMR -bwC +dUc cLf vxX vxX @@ -112330,7 +112319,7 @@ vxX vxX vxX vxX -bwC +dUc wRN fdC uVP @@ -112547,10 +112536,10 @@ pih cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf cLf pkl @@ -112579,15 +112568,15 @@ nkM nkM nkM nkM -bwC +dUc cLf -bwC +dUc vxX vxX vxX vxX vxX -bwC +dUc fTX rLK hfp @@ -112804,10 +112793,10 @@ pih cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf cLf cLf @@ -112836,26 +112825,26 @@ gXw gHL jGy moe -bwC +dUc cLf -bwC +dUc vxX vxX vxX vxX vxX vxX -bwC +dUc eTZ -bwC +dUc xLu rZB pLe -bwC +dUc lfG rZB pLe -bwC +dUc lfG aUx kUX @@ -113048,11 +113037,11 @@ cLf cLf cLf shs -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc pbP pih pbP @@ -113061,14 +113050,14 @@ pbP cLf cLf cLf -bwC +dUc fYe fYe wfz -bwC +dUc vxX -bwC -bwC +dUc +dUc ilp ilp ilp @@ -113093,13 +113082,13 @@ uEV rRO yai moe -bwC -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc +dUc vxX vxX nbu @@ -113307,12 +113296,12 @@ cLf shs cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -113350,13 +113339,13 @@ rxn rRO mIa moe -bwC +dUc cLf iUF cLf cLf cLf -bwC +dUc vxX vxX nbu @@ -113564,12 +113553,12 @@ cLf shs shs cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -113607,13 +113596,13 @@ rxn rRO iNC moe -bwC +dUc cLf iUF cLf cLf cLf -bwC +dUc vxX vxX nbu @@ -113825,13 +113814,13 @@ shs shs shs shs -bwC +dUc wfz -bwC +dUc shs shs shs -bwC +dUc vxX vxX vxX @@ -113864,13 +113853,13 @@ hmG gME xGg moe -bwC +dUc cLf iUF cLf cLf cLf -bwC +dUc vxX vxX nbu @@ -114121,13 +114110,13 @@ moe fDj fDj moe -bwC +dUc cLf iUF cLf cLf cLf -bwC +dUc vxX vxX nbu @@ -114146,11 +114135,11 @@ nbu vxX mUQ cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf vxX vxX @@ -114375,16 +114364,16 @@ fDj moe iyE moe -bwC -bwC -bwC +dUc +dUc +dUc nmN cLf iUF cLf cLf cLf -bwC +dUc cLf vxX vxX @@ -114403,18 +114392,18 @@ fYe fYe uVI cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf vxX vxX vxX vxX -bwC +dUc cLf mDV uFC @@ -114626,13 +114615,13 @@ etW cLf cLf cLf -bwC -bwC -bwC +dUc +dUc +dUc moe aub moe -bwC +dUc cLf cLf cLf @@ -114641,12 +114630,12 @@ iUF cLf cLf cLf -bwC +dUc cLf cLf vxX cLf -bwC +dUc vxX vxX vxX @@ -114660,18 +114649,18 @@ fYe vxX mUQ vxX -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf vxX vxX vxX -bwC +dUc cLf mDV uFC @@ -114875,22 +114864,22 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc iUF iUF cLf cLf cLf -bwC +dUc ojz aHZ ojz -bwC -bwC +dUc +dUc iUF iUF iUF @@ -114898,12 +114887,12 @@ iUF cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -114917,19 +114906,19 @@ vxX vxX vxX vxX -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf vxX vxX vxX vxX -bwC -bwC +dUc +dUc mDV uFC ivC @@ -115141,7 +115130,7 @@ cLf iUF iUF iUF -bwC +dUc nmN dXU dXU @@ -115155,17 +115144,17 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -115174,11 +115163,11 @@ cLf cLf vxX vxX -bwC +dUc iUF iUF iUF -bwC +dUc vxX vxX vxX @@ -115202,10 +115191,10 @@ uFC vxX vxX vxX -kkx -kkx -kkx -kkx +cxg +cxg +cxg +cxg vxX vxX vxX @@ -115400,9 +115389,9 @@ cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -115412,17 +115401,17 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -115444,7 +115433,7 @@ mUQ fYe cLf cLf -bwC +dUc uFC kEu kEu @@ -115656,11 +115645,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -115669,17 +115658,17 @@ cLf cLf cLf cLf -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc +dUc cLf cLf cLf @@ -115912,13 +115901,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -115926,17 +115915,17 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -116169,13 +116158,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -116183,17 +116172,17 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -116427,11 +116416,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -116440,17 +116429,17 @@ cLf cLf cLf cLf -bwC -bwC +dUc +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC -bwC +dUc +dUc cLf cLf cLf @@ -116685,9 +116674,9 @@ cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -116698,15 +116687,15 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -116941,11 +116930,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -116955,15 +116944,15 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -117197,13 +117186,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -117212,15 +117201,15 @@ cLf cLf cLf shs -bwC -bwC +dUc +dUc jQS jQS jQS jQS jQS -bwC -bwC +dUc +dUc shs cLf cLf @@ -117454,13 +117443,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -117469,7 +117458,7 @@ cLf cLf cLf shs -bwC +dUc cLf jQS lgO @@ -117477,9 +117466,9 @@ czY kOL jQS cLf -bwC +dUc shs -bwC +dUc cLf cLf cLf @@ -117712,11 +117701,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -117724,19 +117713,19 @@ shs shs shs shs -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc jQS pRN kOL sgc jQS -bwC -bwC +dUc +dUc cLf -bwC +dUc shs shs shs @@ -117970,9 +117959,9 @@ cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -118226,15 +118215,15 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf -bwC +dUc cLf cLf cLf @@ -118254,8 +118243,8 @@ jQS uep qDP qDP -bwC -bwC +dUc +dUc cLf cLf cLf @@ -118482,17 +118471,17 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc jQS tLO jQS @@ -118512,7 +118501,7 @@ ifV jQS qDP cLf -bwC +dUc cLf cLf cLf @@ -118739,17 +118728,17 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC -bwC -bwC -bwC -bwC +dUc +dUc +dUc +dUc +dUc jQS xnB jQS @@ -118997,11 +118986,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -119255,9 +119244,9 @@ cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -119511,16 +119500,16 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf shs -bwC +dUc jQS hAL jQS @@ -119538,8 +119527,8 @@ tVV jQS ucG jQS -bwC -bwC +dUc +dUc shs cLf cLf @@ -119767,13 +119756,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf shs @@ -120024,13 +120013,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -120282,11 +120271,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -120540,9 +120529,9 @@ cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -120796,11 +120785,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -121052,13 +121041,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf fZF @@ -121309,13 +121298,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf fZF @@ -121339,7 +121328,7 @@ jQS jQS jQS fZF -bwC +dUc shs cLf cLf @@ -121567,11 +121556,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -121825,9 +121814,9 @@ cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf @@ -121853,7 +121842,7 @@ wTs jQS jQS fZF -bwC +dUc shs cLf cLf @@ -122081,11 +122070,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -122337,13 +122326,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc dUc dUc fZF @@ -122594,13 +122583,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc dUc dUc fZF @@ -122852,11 +122841,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -122880,7 +122869,7 @@ fZF fZF fZF fZF -bwC +dUc cLf cLf cLf @@ -123110,16 +123099,16 @@ cLf cLf cLf cLf -bwC +dUc cLf -bwC +dUc cLf cLf cLf cLf cLf cLf -bwC +dUc cLf fZF jQS @@ -123136,8 +123125,8 @@ jQS fZF tyd cLf -bwC -bwC +dUc +dUc cLf cLf cLf @@ -123366,18 +123355,18 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf cLf shs shs -bwC +dUc fZF jQS jQS @@ -123622,13 +123611,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -123879,13 +123868,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -124137,11 +124126,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -124161,7 +124150,7 @@ jQS jQS jQS fZF -bwC +dUc cLf cLf cLf @@ -124395,9 +124384,9 @@ cLf cLf cLf cLf -bwC -bwC -bwC +dUc +dUc +dUc cLf cLf cLf @@ -124407,7 +124396,7 @@ cLf cLf cLf cLf -bwC +dUc fZF jQS jQS @@ -124418,7 +124407,7 @@ jQS jQS fZF cLf -bwC +dUc cLf cLf cLf @@ -124651,11 +124640,11 @@ cLf cLf cLf cLf -bwC -bwC +dUc +dUc nmN -bwC -bwC +dUc +dUc cLf cLf cLf @@ -124664,7 +124653,7 @@ cLf cLf cLf cLf -bwC +dUc cLf fZF fZF @@ -124675,7 +124664,7 @@ fZF fZF cLf cLf -bwC +dUc cLf cLf cLf @@ -124908,11 +124897,11 @@ cLf cLf cLf cLf -bwC +dUc xUA uuN oJv -bwC +dUc cLf cLf cLf @@ -124921,18 +124910,18 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -125165,11 +125154,11 @@ cLf cLf cLf cLf -bwC -bwC +dUc +dUc nmN -bwC -bwC +dUc +dUc cLf cLf cLf @@ -125178,18 +125167,18 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -125423,9 +125412,9 @@ cLf cLf cLf cLf -bwC -bwC -bwC +dUc +dUc +dUc cLf cLf cLf @@ -125438,11 +125427,11 @@ shs shs cLf cLf -bwC +dUc cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -125679,11 +125668,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -125935,13 +125924,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -126192,13 +126181,13 @@ cLf cLf cLf cLf -bwC +dUc cLf cLf cLf cLf cLf -bwC +dUc cLf cLf cLf @@ -126450,11 +126439,11 @@ cLf cLf cLf nmN -bwC -bwC +dUc +dUc cLf -bwC -bwC +dUc +dUc nmN cLf cLf @@ -126708,9 +126697,9 @@ cLf cLf cLf cLf -bwC -bwC -bwC +dUc +dUc +dUc cLf cLf cLf @@ -142943,9 +142932,9 @@ hhX hhX hhX hhX -hhX -hhX -hhX +hen +hen +hen hhX hhX hhX @@ -143200,9 +143189,9 @@ hhX hhX hhX hhX -hhX -hhX -hhX +hen +hen +hen hhX hhX hhX @@ -143457,9 +143446,9 @@ vxX hhX hhX fZF -hhX -hhX -hhX +hen +hen +hen fZF hhX hhX @@ -143714,9 +143703,9 @@ fYe fYe qHE fZF -hhX -hhX -hhX +hen +hen +hen fZF hhX hhX @@ -145700,11 +145689,11 @@ hhX hhX hhX hhX -hhX -hhX -hhX -hhX -hhX +hen +hen +hen +hen +hen vxX vxX vxX @@ -145957,11 +145946,11 @@ hhX hhX hhX hhX -hhX -fNW -hhX -hhX -hhX +hen +fOe +hen +hen +hen vxX vxX vxX @@ -146214,11 +146203,11 @@ hhX hhX hhX hhX -hhX -hhX -hhX -hhX -hhX +hen +hen +hen +hen +hen vxX vxX vxX @@ -156256,10 +156245,10 @@ vxX vxX unk unk -kkx -kkx -kkx -kkx +cxg +cxg +cxg +cxg unk unk vxX @@ -156512,12 +156501,12 @@ vxX vxX vxX unk -kkx -kkx -kkx +cxg +cxg +cxg nQT -kkx -kkx +cxg +cxg unk jCD jCD @@ -156769,12 +156758,12 @@ dsG vxX vxX unk -kkx +cxg joM joM joM joM -kkx +cxg eOx wMY apb @@ -157026,12 +157015,12 @@ dsG dsG dsG any -kkx +cxg joM joM joM joM -kkx +cxg eOx fFt cTH @@ -157283,12 +157272,12 @@ fYe fYe fYe unk -kkx -kkx -kkx -kkx -kkx -kkx +cxg +cxg +cxg +cxg +cxg +cxg unk jCD jCD @@ -157541,10 +157530,10 @@ fYe fYe unk unk -kkx -kkx -kkx -kkx +cxg +cxg +cxg +cxg unk unk vxX @@ -167021,7 +167010,7 @@ oID hhX hhX hhX -kkx +cxg srs bFS bFS @@ -167277,7 +167266,7 @@ hhX oID jVV jVV -kkx +cxg pvT srs upF @@ -167534,8 +167523,8 @@ hhX oID hhX hhX -kkx -kkx +cxg +cxg srs mCt riQ @@ -167792,7 +167781,7 @@ oID hhX hhX hhX -kkx +cxg srs riQ bNI @@ -169076,7 +169065,7 @@ hhX oID hhX hhX -kkx +cxg mQE mQE gwF @@ -169332,8 +169321,8 @@ hhX hhX hhX hhX -kkx -kkx +cxg +cxg vxX imZ mQE @@ -169589,7 +169578,7 @@ hhX hhX hhX hhX -kkx +cxg pvT vxX vxX @@ -169865,7 +169854,7 @@ wYj pdo sJT vxX -pvT +uif hhX hhX fYe @@ -170717,9 +170706,9 @@ vxX vxX vxX vxX -hhX -hhX -hhX +hen +hen +hen jVV hhX hhX @@ -172177,7 +172166,7 @@ vAB kWb kWb kWb -cxg +fYe hhX hhX hhX @@ -172541,7 +172530,7 @@ uJc mml mml eLU -nsH +jVV oID hhX hhX @@ -172690,7 +172679,7 @@ kWb kWb kWb kWb -cxg +fYe hhX hhX hhX @@ -179641,8 +179630,8 @@ uif mNZ mNZ fYe -hhX -hhX +hen +hen fYe mNZ mNZ @@ -179898,9 +179887,9 @@ fYe fYe fYe fYe -hhX -hhX -hhX +hen +hen +hen mNZ mNZ mNZ @@ -180155,10 +180144,10 @@ mNZ mNZ mNZ fYe -hhX -hhX -hhX -hCu +hen +hen +hen +umg hhX jVV hhX @@ -180412,9 +180401,9 @@ hhX hhX hhX hhX -hhX -hhX -hhX +hen +hen +hen hhX hhX jVV @@ -180669,9 +180658,9 @@ hhX hhX hhX hhX -hhX -hhX -hhX +hen +hen +hen hhX hhX uOY @@ -180707,9 +180696,9 @@ vxX vxX vxX vxX -cxg -cxg -cxg +fYe +fYe +fYe hhX hhX hhX diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm index aef9231e620..0e265110bde 100644 --- a/_maps/shuttles/emergency_birdshot.dmm +++ b/_maps/shuttles/emergency_birdshot.dmm @@ -287,7 +287,7 @@ "mU" = ( /obj/structure/lattice, /turf/template_noop, -/area/template_noop) +/area/shuttle/escape) "no" = ( /obj/item/trash/popcorn/caramel, /turf/open/floor/mineral/titanium, @@ -552,7 +552,7 @@ /obj/structure/lattice, /obj/item/stack/rods/two, /turf/template_noop, -/area/template_noop) +/area/shuttle/escape) "Ay" = ( /obj/item/shard{ pixel_y = 19 diff --git a/_maps/shuttles/emergency_wawa.dmm b/_maps/shuttles/emergency_wawa.dmm index 01d03aa7c5d..191fc136dcf 100644 --- a/_maps/shuttles/emergency_wawa.dmm +++ b/_maps/shuttles/emergency_wawa.dmm @@ -111,7 +111,7 @@ /obj/structure/lattice, /obj/structure/marker_beacon/burgundy, /turf/template_noop, -/area/template_noop) +/area/shuttle/escape) "au" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -728,7 +728,7 @@ "Pw" = ( /obj/structure/lattice, /turf/template_noop, -/area/template_noop) +/area/shuttle/escape) "QP" = ( /obj/machinery/conveyor/auto/inverted{ dir = 1 diff --git a/_maps/shuttles/mining_freight.dmm b/_maps/shuttles/mining_freight.dmm index 70605f222e7..ead08ff80ac 100644 --- a/_maps/shuttles/mining_freight.dmm +++ b/_maps/shuttles/mining_freight.dmm @@ -106,7 +106,7 @@ /obj/effect/spawner/structure/window/reinforced/shuttle, /obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating, -/area/template_noop) +/area/shuttle/mining) "q" = ( /obj/structure/ore_box, /obj/effect/turf_decal/delivery, diff --git a/_maps/shuttles/pirate_grey.dmm b/_maps/shuttles/pirate_grey.dmm index 802f837c6dd..22356be732c 100644 --- a/_maps/shuttles/pirate_grey.dmm +++ b/_maps/shuttles/pirate_grey.dmm @@ -1232,7 +1232,7 @@ /area/shuttle/pirate) "Pn" = ( /turf/closed/wall, -/area/template_noop) +/area/shuttle/pirate) "PM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/grille_or_waste, diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index c52119df941..d343cc23eef 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -333,7 +333,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/template_noop) +/area/shuttle/pirate) "xj" = ( /obj/structure/table/glass, /obj/item/storage/medkit/brute, diff --git a/code/game/turfs/open/floor/hull.dm b/code/game/turfs/open/floor/hull.dm index 54ea29e051a..6836c29b960 100644 --- a/code/game/turfs/open/floor/hull.dm +++ b/code/game/turfs/open/floor/hull.dm @@ -10,6 +10,16 @@ name = "shuttle ceiling plating" var/old_turf_type +/turf/open/floor/engine/hull/ceiling/Initialize(mapload) + . = ..() + if(!istype(loc, /area/space)) + return + if(istype(loc, /area/space/nearstation)) + return + new /obj/effect/mapping_error (src) //We're in a normal space tile, meaning we aren't lit correct. + ///datum/unit_test/mapping_nearstation_test.dm SHOULD fail this case automatically + //this is just here so the mapper responsible can easily see where the issues are directly on the map. + /turf/open/floor/engine/hull/ceiling/AfterChange(flags, oldType) . = ..() old_turf_type = oldType diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index e59b04e6c7e..e81425b9a1a 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -107,6 +107,12 @@ return return ..(ceiling) +///Used for marking mapping errors. These should only be created by cases explicitly caught by unit tests, and should NEVER actually appear in production. +/obj/effect/mapping_error + name = "I AM ERROR" + desc = "IF YOU SEE ME, YELL AT A MAPPER!!!" + icon = 'icons/effects/mapping_helpers.dmi' + icon_state = "mapping_error" /obj/effect/mapping_helpers icon = 'icons/effects/mapping_helpers.dmi' diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 593b949e2b2..d164bca069d 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -180,6 +180,7 @@ #include "map_landmarks.dm" #include "mapload_space_verification.dm" #include "mapping.dm" +#include "mapping_nearstation_test.dm" #include "mecha_damage.dm" #include "medical_wounds.dm" #include "merge_type.dm" diff --git a/code/modules/unit_tests/mapload_space_verification.dm b/code/modules/unit_tests/mapload_space_verification.dm index 35556c85fb4..843de4f8fdd 100644 --- a/code/modules/unit_tests/mapload_space_verification.dm +++ b/code/modules/unit_tests/mapload_space_verification.dm @@ -32,6 +32,8 @@ var/area/turf_area = get_area(iterated_turf) if(!isspaceturf(iterated_turf) || is_type_in_typecache(turf_area, excluded_area_typecache)) continue // Alright, so let's assume we have intended behavior. If something yorks, we'll get a bare `/area` (maploader?) or a mapper is doing something they shouldn't be doing. + if(HAS_TRAIT(iterated_turf, TRAIT_HYPERSPACE_STOPPED)) + continue // This means that a shuttle with a noop template turf is just temporarily parked ontop of us and that we're not actually a part of it. We don't have to care about it as it will leave us alone when it flies away. // We need turf_area.type for the error message because we have fifteen million ruin areas named "Unexplored Location" and it's completely unhelpful here. TEST_FAIL("Space turf [iterated_turf.type] found in non-allowed area ([turf_area.type]) at [AREACOORD(iterated_turf)]! Please ensure that all space turfs are in an /area/space!") diff --git a/code/modules/unit_tests/mapping_nearstation_test.dm b/code/modules/unit_tests/mapping_nearstation_test.dm new file mode 100644 index 00000000000..d428b826634 --- /dev/null +++ b/code/modules/unit_tests/mapping_nearstation_test.dm @@ -0,0 +1,40 @@ +///Detects movables that may have been accidentally placed in space, as well as movables which do not have the proper nearspace area (meaning they aren't lit properly.) +/datum/unit_test/mapping_nearstation_test + priority = TEST_PRE + +/datum/unit_test/mapping_nearstation_test/Run() + if(SSmapping.is_planetary()) + return //No need to test for orphaned spaced atoms on this map. + + var/list/safe_atoms = typecacheof(list( + /atom/movable/mirage_holder, + /obj/docking_port, + /obj/effect/landmark, + /obj/effect/abstract, + /obj/effect/mapping_error, + )) //Mapping stuff that we don't actually have to be concerned about. + var/list/safe_areas = typecacheof(list( + /area/misc/testroom, + /area/station/holodeck, + )) + + for(var/station_z in SSmapping.levels_by_trait(ZTRAIT_STATION)) + var/list/turfs_to_check = Z_TURFS(station_z) + for(var/turf/station_turf as anything in turfs_to_check) + var/area/turf_area = station_turf.loc + if(turf_area.static_lighting || is_type_in_typecache(turf_area, safe_areas)) //Only care about turfs that don't have lighting enabled. + continue + var/has_thing = FALSE + for(var/atom/movable/thing_on_the_turf as anything in station_turf.contents) //Find an item on the turf, this can help the mapper identify the turf more easily when combined with the exact coords. + if(is_type_in_typecache(thing_on_the_turf, safe_atoms)) + continue + TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [thing_on_the_turf.type] with area of type [turf_area.type]") + has_thing = TRUE + break + if(!has_thing && !isspaceturf(station_turf) && !istype(station_turf, /turf/open/openspace)) //In case it's just a turf without an area + if(istype(station_turf, /turf/open/floor/engine/hull/ceiling)) + TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [station_turf.type] with area of type [turf_area.type]. The turf on the z-level below is a shuttle dock and generated me! An error landmark has been generated on the map for easier debugging!") + else + TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [station_turf.type] with area of type [turf_area.type]") + if(!succeeded) + TEST_FAIL("Movable Atom located without a proper area. Please verify they are supposed to be there. If they are correct, change the area to /area/space/nearstation (or the correct surrounding type).") diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index ad09351e787..47684f4664e 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index c78e8fecf7c..8a2b715502f 100644 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -21,12 +21,14 @@ if command -v rg >/dev/null 2>&1; then fi code_files="code/**/**.dm" map_files="_maps/**/**.dmm" + shuttle_map_files="_maps/shuttles/**.dmm" code_x_515="code/**/!(__byond_version_compat).dm" else pcre2_support=0 grep=grep code_files="-r --include=code/**/**.dm" map_files="-r --include=_maps/**/**.dmm" + shuttle_map_files="-r --include=_maps/shuttles/**.dmm" code_x_515="-r --include=code/**/!(__byond_version_compat).dm" fi @@ -304,6 +306,12 @@ if [ "$pcre2_support" -eq 1 ]; then echo -e "${RED}ERROR: Invalid pronoun helper found.${NC}" st=1 fi; + part "shuttle area checker" + if $grep -PU '(},|\/obj|\/mob|\/turf\/(?!template_noop).+)[^()]+\/area\/template_noop\)' $shuttle_map_files; then + echo + echo -e "${RED}ERROR: Shuttle has objs or turfs in a template_noop area. Please correct their areas to a shuttle subtype.${NC}" + st=1 +fi; else echo -e "${RED}pcre2 not supported, skipping checks requiring pcre2" echo -e "if you want to run these checks install ripgrep with pcre2 support.${NC}"