From baca931f7fe860b0b754fa79b5d4c3540b1efca4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 5 Mar 2024 23:36:41 +0100 Subject: [PATCH] [MIRROR] Fixes some snowless outdoor AI satellite tiles (#26725) * Fixes some snowless outdoor AI satellite tiles (#81766) ## About The Pull Request This fixes two funky camera spots with misconfigured areas. This leads to single tiles of non-storm space. ![image](https://github.com/tgstation/tgstation/assets/28870487/5bc63d7c-0565-42f7-9463-a4a7b99ec9c0) ![image](https://github.com/tgstation/tgstation/assets/28870487/555b8275-9e59-4c07-8f20-fd3a100d77ba) Anyways, this doesn't happen anymore. As far as I'm aware, this isn't due to any camera shenanigans either since the other outdoor AI sat cams use the icebox outdoor area and dont have any problems. ## Why It's Good For The Game Clean clean fix fix ugly ugly go away. ## Changelog :cl: Rhials fix: Fixes some tiles outside the Icebox AI satellite not getting hit by storms. /:cl: * Fixes some snowless outdoor AI satellite tiles --------- Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com> --- .../map_files/IceBoxStation/IceBoxStation.dmm | 334 +++++++++--------- 1 file changed, 167 insertions(+), 167 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index f1b944a8cc5..1958b36d050 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -5049,6 +5049,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/mine/laborcamp/security) +"bAN" = ( +/obj/machinery/camera/directional/west{ + c_tag = "MiniSat External NorthEast"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "bAR" = ( /obj/machinery/duct, /obj/machinery/door/poddoor/preopen{ @@ -6935,6 +6943,19 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +"ccp" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/south{ + id = "Dorm5"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) "ccr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9394,12 +9415,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"cMh" = ( -/obj/structure/bed/pod, -/obj/effect/spawner/random/bedsheet/any, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/maintenance/port/fore) "cMj" = ( /obj/structure/stairs/west, /obj/structure/railing{ @@ -10048,6 +10063,12 @@ }, /turf/open/floor/iron, /area/station/cargo/office) +"cXp" = ( +/obj/structure/bed/pod, +/obj/effect/spawner/random/bedsheet/any, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/maintenance/port/fore) "cXu" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -10404,6 +10425,19 @@ /obj/structure/cable, /turf/open/floor/carpet/red, /area/station/security/prison/work) +"dcq" = ( +/obj/structure/bed, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/button/door/directional/east{ + id = "Dorm3"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) "dcr" = ( /obj/machinery/chem_master, /obj/structure/window/reinforced/spawner/directional/south, @@ -14206,19 +14240,6 @@ "elw" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/upper) -"elD" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/structure/bed{ - dir = 1 - }, -/obj/effect/spawner/random/bedsheet{ - dir = 1 - }, -/obj/effect/spawner/random/contraband/permabrig_gear, -/turf/open/floor/iron/white, -/area/station/security/prison/safe) "elT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ dir = 8 @@ -17363,19 +17384,6 @@ /obj/machinery/plumbing/sender, /turf/open/floor/plating, /area/station/medical/chemistry) -"fmz" = ( -/obj/structure/bed, -/obj/machinery/airalarm/directional/north, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/button/door/directional/east{ - id = "Dorm3"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/dorms) "fmA" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/line{ @@ -21989,19 +21997,6 @@ "gKQ" = ( /turf/closed/wall, /area/station/security/courtroom) -"gKR" = ( -/obj/machinery/conveyor{ - dir = 6; - id = "mining_internal" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/brm, -/turf/open/floor/iron, -/area/mine/production) "gLj" = ( /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/engine, @@ -25394,20 +25389,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood, /area/station/security/prison/rec) -"hPp" = ( -/obj/structure/bed{ - dir = 1 - }, -/obj/effect/spawner/random/bedsheet{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/prison/safe) "hPs" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) @@ -28608,20 +28589,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) -"iPf" = ( -/obj/structure/bed, -/obj/machinery/airalarm/directional/north, -/obj/effect/spawner/random/bedsheet, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/east{ - id = "Dorm4"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) "iPm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32855,19 +32822,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"kfp" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/south{ - id = "Dorm5"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/dorms) "kfs" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos) @@ -34316,6 +34270,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"kzv" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet/any, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "kzw" = ( /turf/closed/wall/r_wall, /area/station/security/medical) @@ -34812,18 +34771,6 @@ dir = 1 }, /area/station/commons/storage/art) -"kGN" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/button/door/directional/south{ - id = "Dorm6"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) "kGP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red{ @@ -38673,19 +38620,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/dorms) -"lOG" = ( -/obj/structure/bed, -/obj/machinery/airalarm/directional/north, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/button/door/directional/east{ - id = "Dorm2"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) "lOI" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ dir = 5 @@ -41304,6 +41238,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/dark, /area/station/science/explab) +"mHe" = ( +/obj/machinery/conveyor{ + dir = 6; + id = "mining_internal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/brm, +/turf/open/floor/iron, +/area/mine/production) "mHu" = ( /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, @@ -41425,6 +41372,19 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"mJO" = ( +/obj/structure/bed, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/button/door/directional/east{ + id = "Dorm2"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) "mJX" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/hollow/reinforced/middle, @@ -45277,6 +45237,20 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"nOl" = ( +/obj/structure/bed, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/east{ + id = "Dorm4"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) "nOx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -47366,14 +47340,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark/side, /area/mine/eva) -"oxi" = ( -/obj/machinery/camera/directional/west{ - c_tag = "MiniSat External NorthEast"; - network = list("minisat"); - start_active = 1 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/station/ai_monitored/turret_protected/aisat/maint) "oxB" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -49231,6 +49197,14 @@ /obj/effect/spawner/random/vending/colavend, /turf/open/floor/wood, /area/station/command/meeting_room) +"oYZ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "MiniSat External NorthWest"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "oZd" = ( /obj/structure/fence/corner{ dir = 9 @@ -49831,6 +49805,18 @@ dir = 1 }, /area/station/hallway/primary/central) +"piC" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/button/door/directional/south{ + id = "Dorm6"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) "piD" = ( /obj/machinery/computer/security/labor, /obj/structure/cable, @@ -51303,16 +51289,6 @@ }, /turf/open/floor/iron/large, /area/station/service/hydroponics/garden) -"pEu" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #2" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/east, -/mob/living/simple_animal/bot/mulebot, -/turf/open/floor/iron, -/area/station/cargo/storage) "pEE" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -56059,14 +56035,6 @@ /obj/structure/closet, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"rbm" = ( -/obj/machinery/camera/directional/east{ - c_tag = "MiniSat External NorthWest"; - network = list("minisat"); - start_active = 1 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/station/ai_monitored/turret_protected/aisat/maint) "rbs" = ( /obj/effect/turf_decal/tile/yellow, /obj/machinery/light/directional/east, @@ -58794,6 +58762,16 @@ dir = 4 }, /area/station/hallway/secondary/entry) +"rUy" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #2" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/east, +/mob/living/simple_animal/bot/mulebot, +/turf/open/floor/iron, +/area/station/cargo/storage) "rUz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -63498,6 +63476,19 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured, /area/station/security/interrogation) +"tsK" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/structure/bed{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet{ + dir = 1 + }, +/obj/effect/spawner/random/contraband/permabrig_gear, +/turf/open/floor/iron/white, +/area/station/security/prison/safe) "tsQ" = ( /obj/machinery/door/airlock/public/glass{ name = "Public Mining Storage" @@ -64907,11 +64898,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"tNM" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet/any, -/turf/open/floor/plating, -/area/station/maintenance/department/medical/morgue) "tNY" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -66645,6 +66631,20 @@ "usP" = ( /turf/open/misc/asteroid/snow/standard_air, /area/station/science/research) +"usS" = ( +/obj/structure/bed{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/security/prison/safe) "utr" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -74275,15 +74275,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/security/processing) -"wOf" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #1" - }, -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/mulebot, -/turf/open/floor/iron, -/area/station/cargo/storage) "wOh" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -75177,6 +75168,15 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) +"xaF" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #1" + }, +/obj/effect/turf_decal/bot, +/mob/living/simple_animal/bot/mulebot, +/turf/open/floor/iron, +/area/station/cargo/storage) "xaH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -104857,7 +104857,7 @@ tWK tWK tWK xhK -elD +tsK jGg vVH krV @@ -105123,7 +105123,7 @@ fHg eek vVH fps -hPp +usS vVH keD kqR @@ -105894,7 +105894,7 @@ fHg hnt vVH fps -hPp +usS vVH gwy ixw @@ -164572,7 +164572,7 @@ dQd nWH nWH nWH -gKR +mHe dAq adm dTF @@ -180506,7 +180506,7 @@ qMz hjM gmO sBJ -tNM +kzv nxM bYY cDh @@ -228499,7 +228499,7 @@ tCr tCr lJO gLZ -cMh +cXp xiW lJO hjI @@ -231374,8 +231374,8 @@ ppo lxb eWV kXr -wOf -pEu +xaF +rUy smx qqJ gjP @@ -240843,16 +240843,16 @@ sDl skl jOQ skl -iPf +nOl oCF ygB -fmz +dcq peb ygB -lOG +mJO oCF ygB -lOG +mJO oCF ygB lBD @@ -242643,7 +242643,7 @@ cIK jOQ skl ddr -kfp +ccp ygB kCb gya @@ -243671,7 +243671,7 @@ iHz jOQ skl pOo -kGN +piC ygB fXo aos @@ -246873,7 +246873,7 @@ mfD bln bln bln -rbm +oYZ bln wNO wNO @@ -250471,7 +250471,7 @@ oiy bln bln bln -oxi +bAN bln wNO wNO