From 3add0095fa0a56a09ae9f0a9f13773dec0716499 Mon Sep 17 00:00:00 2001 From: N3D6 <71906740+N3D6@users.noreply.github.com> Date: Sat, 2 Mar 2024 21:02:15 -0500 Subject: [PATCH 1/3] ned you are fucking stupid --- _maps/map_files/IceMeta/IceMeta.dmm | 459 +++++++++++++++------------- 1 file changed, 252 insertions(+), 207 deletions(-) diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 0f03f144967e..20dbeefb6168 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -6692,8 +6692,8 @@ dir = 8; dwidth = 12; height = 17; - shuttle_id = "syndicate_nw"; name = "northwest of station"; + shuttle_id = "syndicate_nw"; width = 23 }, /turf/open/genturf, @@ -7337,6 +7337,24 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"chZ" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "cib" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 @@ -8895,9 +8913,9 @@ dheight = 4; dwidth = 4; height = 9; - shuttle_id = "aux_base_zone"; name = "aux base zone"; roundstart_template = /datum/map_template/shuttle/aux_base/default; + shuttle_id = "aux_base_zone"; width = 9 }, /turf/open/floor/plating, @@ -13306,7 +13324,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/west, +/obj/machinery/power/apc/auto_name/west{ + pixel_x = -25 + }, /turf/open/floor/plasteel, /area/engine/engine_smes) "dWi" = ( @@ -14434,16 +14454,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) -"epc" = ( -/obj/structure/sign/warning/biohazard{ - pixel_x = -32 - }, -/obj/effect/turf_decal/trimline/green/filled/line/lower{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/filled/corner/lower, -/turf/open/floor/plasteel/white, -/area/medical/medbay/aft) "ept" = ( /turf/closed/wall/r_wall, /area/engine/engineering) @@ -21207,6 +21217,20 @@ /obj/effect/turf_decal/trimline/blue/warning/lower, /turf/open/floor/plasteel/dark, /area/aisat) +"gnR" = ( +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner, +/turf/open/floor/plasteel, +/area/engine/atmos) "gnS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22404,8 +22428,8 @@ dir = 8; dwidth = 2; height = 13; - shuttle_id = "ferry_home"; name = "port bay 2"; + shuttle_id = "ferry_home"; width = 5 }, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -23201,6 +23225,35 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/mine/eva_secondary) +"gRa" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Antechamber"; + req_one_access_txt = "32;19" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "gRi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25199,8 +25252,8 @@ area_type = /area/icemoon/underground/explored/laborcamp; dwidth = 2; height = 5; - shuttle_id = "laborcamp_away"; name = "labor camp"; + shuttle_id = "laborcamp_away"; width = 9 }, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -27574,8 +27627,8 @@ dir = 2; dwidth = 11; height = 22; - shuttle_id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Port"; + shuttle_id = "whiteship_home"; width = 35 }, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -28052,21 +28105,6 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) -"ipf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/dark_blue/warning/lower{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "ipl" = ( /obj/structure/urinal{ pixel_y = 29 @@ -28480,8 +28518,8 @@ dir = 8; dwidth = 5; height = 7; - shuttle_id = "supply_home"; name = "Cargo Bay"; + shuttle_id = "supply_home"; width = 12 }, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -31515,8 +31553,8 @@ dir = 2; dwidth = 9; height = 25; - shuttle_id = "emergency_home"; name = "MetaStation emergency evac bay"; + shuttle_id = "emergency_home"; width = 29 }, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -31815,31 +31853,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"jpx" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_one_access_txt = "32;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "jpy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -33066,6 +33079,25 @@ /obj/structure/window/reinforced, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, /area/icemoon/top_layer/outdoors) +"jGd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "jGf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -33445,19 +33477,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"jKA" = ( -/obj/structure/table, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/turf/open/floor/plasteel, -/area/engine/atmos) "jKF" = ( /obj/machinery/light/small{ dir = 4 @@ -39600,6 +39619,20 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"lBC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "lBD" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -41045,21 +41078,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/secondary/command) -"lVz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/warning/lower{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "lVB" = ( /obj/structure/window/reinforced{ dir = 8 @@ -44092,6 +44110,25 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"mNy" = ( +/obj/machinery/camera{ + c_tag = "Virology - Entrance"; + dir = 8; + network = list("ss13","medbay") + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "mNC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48845,21 +48882,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"ocT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "ocV" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 @@ -50770,19 +50792,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/security/brig) -"oGh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/dark_blue/warning/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "oGn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54066,25 +54075,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"pGF" = ( -/obj/machinery/camera{ - c_tag = "Virology - Entrance"; - dir = 8; - network = list("ss13","medbay") - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/green/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/warning/lower, -/turf/open/floor/plasteel/white, -/area/medical/medbay/aft) "pGQ" = ( /obj/item/beacon, /obj/machinery/atmospherics/pipe/simple/purple/visible{ @@ -57955,6 +57945,35 @@ }, /turf/open/floor/plasteel, /area/science/storage) +"qMf" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Foyer"; + req_one_access_txt = "32;19" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "qMB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59134,6 +59153,16 @@ dir = 5 }, /area/maintenance/port/fore) +"rfH" = ( +/obj/structure/sign/warning/biohazard{ + pixel_x = -32 + }, +/obj/effect/turf_decal/trimline/green/filled/line/lower{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "rfP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -60509,6 +60538,27 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel/dark, /area/bridge) +"rDy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "rDB" = ( /obj/item/paper_bin{ pixel_x = -2; @@ -62057,7 +62107,9 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "san" = ( -/obj/machinery/airalarm/directional/west, +/obj/machinery/airalarm/directional/west{ + pixel_x = -24 + }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -67453,9 +67505,9 @@ dir = 8; dwidth = 3; height = 15; - shuttle_id = "arrivals_stationary"; name = "arrivals"; roundstart_template = /datum/map_template/shuttle/arrival/box; + shuttle_id = "arrivals_stationary"; width = 7 }, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -68962,14 +69014,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) -"tYT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/atmos/distro) "tZe" = ( /turf/open/floor/plating, /area/maintenance/port/fore) @@ -71524,6 +71568,26 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"uIL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/atmos/distro) "uIM" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower, /turf/open/floor/plasteel/white, @@ -71735,31 +71799,6 @@ }, /turf/open/floor/plasteel/white/side, /area/medical/medbay/central) -"uMI" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Foyer"; - req_one_access_txt = "32;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "uMW" = ( /obj/machinery/disposal/deliveryChute{ dir = 4 @@ -78175,6 +78214,24 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"wAL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "wAR" = ( /turf/closed/wall/r_wall, /area/science/robotics/lab) @@ -80415,14 +80472,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"xiL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/engine/atmos/distro) "xiN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -80737,9 +80786,9 @@ dir = 8; dwidth = 2; height = 5; - shuttle_id = "laborcamp_home"; name = "fore bay 1"; roundstart_template = /datum/map_template/shuttle/labour/box; + shuttle_id = "laborcamp_home"; width = 9 }, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, @@ -82630,24 +82679,6 @@ }, /turf/open/floor/wood, /area/bridge/showroom/corporate) -"xJC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/warning/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "xJH" = ( /obj/structure/sink{ dir = 4; @@ -82856,6 +82887,20 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/dark, /area/security/warden) +"xMI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos/distro) "xMM" = ( /obj/structure/table, /obj/machinery/power/apc{ @@ -237298,7 +237343,7 @@ okB lxx wLu xJi -epc +rfH lxx gMl fFr @@ -237555,7 +237600,7 @@ fFw fjl aRC beQ -pGF +mNy sBO elA rsQ @@ -256525,7 +256570,7 @@ uqC jTo ipA sJN -jKA +gnR oMh wRE jIJ @@ -257303,7 +257348,7 @@ hms ctq tRO weT -tYT +xMI hjv iQG nIs @@ -257554,7 +257599,7 @@ kyT xcS sJN gUo -ocT +rDy lFQ jIJ waM @@ -257815,7 +257860,7 @@ hML enq fAF bRV -xiL +uIL sVK tXc cim @@ -268598,7 +268643,7 @@ tRh tRh tSE gpE -oGh +lBC eys euQ tRh @@ -268855,7 +268900,7 @@ tRh tRh jYF jYF -uMI +qMf uZL jYF tRh @@ -269112,7 +269157,7 @@ tRh tRh eeG wuI -lVz +chZ diS jYF jYF @@ -269626,7 +269671,7 @@ tRh tRh imJ ckh -xJC +jGd pVY qoe bRk @@ -269883,7 +269928,7 @@ jYF jYF jYF aCS -jpx +gRa vSu qoe qoq @@ -270140,7 +270185,7 @@ mej aeQ kfW nXI -ipf +wAL kgu qoe iPP From a168ea906ce8c9cf17bc8647c259d06323b4319e Mon Sep 17 00:00:00 2001 From: N3D6 <71906740+N3D6@users.noreply.github.com> Date: Sat, 2 Mar 2024 21:06:21 -0500 Subject: [PATCH 2/3] idiot --- .../StationRuins/MetaStation/meta_teg.dmm | 99 ++-- _maps/map_files/IceMeta/IceMeta.dmm | 474 +++++++++--------- 2 files changed, 279 insertions(+), 294 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm index 1cd87738cead..df5bd9f0eb6c 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm @@ -167,6 +167,18 @@ }, /turf/open/floor/engine/airless, /area/engine/engineering) +"gA" = ( +/obj/structure/sign/warning/securearea{ + pixel_y = 32 + }, +/obj/effect/turf_decal/stripes{ + dir = 5 + }, +/obj/structure/sign/warning/vacuum/external{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "gK" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -427,6 +439,17 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, /area/space/nearstation) +"oP" = ( +/obj/structure/closet/emcloset/anchored, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/advanced_airlock_controller/lavaland{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plating, +/area/engine/engineering) "oZ" = ( /obj/machinery/bounty_board, /turf/closed/wall/r_wall, @@ -617,6 +640,13 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"wj" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector{ + dir = 8; + id = "teghot_in" + }, +/turf/open/floor/engine/airless, +/area/engine/engineering) "wu" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 1 @@ -668,17 +698,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"yP" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/closet/emcloset/anchored, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering) "yS" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -736,12 +755,6 @@ /obj/machinery/atmospherics/pipe/manifold/dark/visible, /turf/open/floor/engine, /area/engine/engineering) -"Az" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/engine/airless, -/area/engine/engineering) "AW" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -854,12 +867,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/engine/engineering) -"FQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector{ - dir = 8 - }, -/turf/open/floor/engine/airless, -/area/engine/engineering) "Gm" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -1032,24 +1039,6 @@ /obj/structure/lattice, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, /area/space/nearstation) -"Md" = ( -/obj/structure/sign/warning/securearea{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes{ - dir = 5 - }, -/obj/structure/sign/warning/securearea{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes{ - dir = 5 - }, -/obj/structure/sign/warning/vacuum/external{ - pixel_x = 32 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "Ms" = ( /obj/effect/mapping_helpers/teleport_anchor, /obj/effect/turf_decal/stripes/line{ @@ -1136,17 +1125,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"Pu" = ( -/obj/structure/closet/emcloset/anchored, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering) "PC" = ( /obj/machinery/igniter{ id = "teghotburn"; @@ -1380,6 +1358,13 @@ "Vz" = ( /turf/open/floor/engine, /area/engine/engineering) +"VP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{ + dir = 8; + id_tag = "teghot_out" + }, +/turf/open/floor/engine/airless, +/area/engine/engineering) "VQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1640,7 +1625,7 @@ xR xR "} (5,1,1) = {" -Md +gA xR aF pN @@ -1692,7 +1677,7 @@ xR xR "} (7,1,1) = {" -Pu +oP ib Tl Mb @@ -1970,7 +1955,7 @@ UH Mb Tl Yg -yP +oP Tl xR xR @@ -2040,9 +2025,9 @@ Mb lU Xo PC -FQ +wj fU -Az +VP PC nK lU diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 20dbeefb6168..a8bca175efcc 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -957,6 +957,26 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, /turf/open/floor/plasteel, /area/engine/atmos/distro) +"aoR" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/atmos/distro) "apf" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -7337,24 +7357,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"chZ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "cib" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 @@ -13022,6 +13024,20 @@ }, /turf/open/floor/plasteel/dark, /area/medical/storage) +"dRJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "dRQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17258,6 +17274,35 @@ /obj/machinery/portable_atmospherics/canister/bz, /turf/open/floor/plasteel, /area/engine/atmos) +"fjF" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Antechamber"; + req_one_access_txt = "32;19" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "fjK" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 @@ -18678,6 +18723,25 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/carpet, /area/bridge) +"fGz" = ( +/obj/machinery/camera{ + c_tag = "Virology - Entrance"; + dir = 8; + network = list("ss13","medbay") + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "fGA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21217,20 +21281,6 @@ /obj/effect/turf_decal/trimline/blue/warning/lower, /turf/open/floor/plasteel/dark, /area/aisat) -"gnR" = ( -/obj/structure/table, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner, -/turf/open/floor/plasteel, -/area/engine/atmos) "gnS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22007,6 +22057,24 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) +"gzs" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "gzI" = ( /turf/open/floor/plasteel/showroomfloor, /area/security/main) @@ -22446,6 +22514,35 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/medical/virology) +"gHd" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Foyer"; + req_one_access_txt = "32;19" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "gHe" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 1 @@ -23225,35 +23322,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/mine/eva_secondary) -"gRa" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_one_access_txt = "32;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "gRi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -27080,6 +27148,27 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"hVa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "hVb" = ( /obj/machinery/light{ dir = 8 @@ -33079,25 +33168,6 @@ /obj/structure/window/reinforced, /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, /area/icemoon/top_layer/outdoors) -"jGd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "jGf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -38914,6 +38984,16 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"lpL" = ( +/obj/structure/sign/warning/biohazard{ + pixel_x = -32 + }, +/obj/effect/turf_decal/trimline/green/filled/line/lower{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "lpZ" = ( /obj/structure/bookcase/random/reference, /turf/open/floor/wood, @@ -39619,20 +39699,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) -"lBC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "lBD" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -44110,25 +44176,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"mNy" = ( -/obj/machinery/camera{ - c_tag = "Virology - Entrance"; - dir = 8; - network = list("ss13","medbay") - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/green/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/white, -/area/medical/medbay/aft) "mNC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -54634,6 +54681,24 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/theatre) +"pQH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "pQO" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, @@ -57945,35 +58010,6 @@ }, /turf/open/floor/plasteel, /area/science/storage) -"qMf" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Foyer"; - req_one_access_txt = "32;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "qMB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59153,16 +59189,6 @@ dir = 5 }, /area/maintenance/port/fore) -"rfH" = ( -/obj/structure/sign/warning/biohazard{ - pixel_x = -32 - }, -/obj/effect/turf_decal/trimline/green/filled/line/lower{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel/white, -/area/medical/medbay/aft) "rfP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -60538,27 +60564,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel/dark, /area/bridge) -"rDy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "rDB" = ( /obj/item/paper_bin{ pixel_x = -2; @@ -63122,6 +63127,20 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"sry" = ( +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner, +/turf/open/floor/plasteel, +/area/engine/atmos) "srI" = ( /obj/machinery/status_display/supply{ pixel_y = 32 @@ -69230,6 +69249,20 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) +"ucO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos/distro) "ucS" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -71568,26 +71601,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"uIL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/atmos/distro) "uIM" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower, /turf/open/floor/plasteel/white, @@ -78214,24 +78227,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"wAL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "wAR" = ( /turf/closed/wall/r_wall, /area/science/robotics/lab) @@ -80088,6 +80083,25 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"xcn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "xcD" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, /turf/open/floor/circuit/green/telecomms, @@ -82887,20 +82901,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/dark, /area/security/warden) -"xMI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos/distro) "xMM" = ( /obj/structure/table, /obj/machinery/power/apc{ @@ -237343,7 +237343,7 @@ okB lxx wLu xJi -rfH +lpL lxx gMl fFr @@ -237600,7 +237600,7 @@ fFw fjl aRC beQ -mNy +fGz sBO elA rsQ @@ -256570,7 +256570,7 @@ uqC jTo ipA sJN -gnR +sry oMh wRE jIJ @@ -257348,7 +257348,7 @@ hms ctq tRO weT -xMI +ucO hjv iQG nIs @@ -257599,7 +257599,7 @@ kyT xcS sJN gUo -rDy +hVa lFQ jIJ waM @@ -257860,7 +257860,7 @@ hML enq fAF bRV -uIL +aoR sVK tXc cim @@ -268643,7 +268643,7 @@ tRh tRh tSE gpE -lBC +dRJ eys euQ tRh @@ -268900,7 +268900,7 @@ tRh tRh jYF jYF -qMf +gHd uZL jYF tRh @@ -269157,7 +269157,7 @@ tRh tRh eeG wuI -chZ +gzs diS jYF jYF @@ -269671,7 +269671,7 @@ tRh tRh imJ ckh -jGd +xcn pVY qoe bRk @@ -269928,7 +269928,7 @@ jYF jYF jYF aCS -gRa +fjF vSu qoe qoq @@ -270185,7 +270185,7 @@ mej aeQ kfW nXI -wAL +pQH kgu qoe iPP From f34c242d52ca22d5d47b5496b1f22873ac453db6 Mon Sep 17 00:00:00 2001 From: N3D6 <71906740+N3D6@users.noreply.github.com> Date: Sat, 2 Mar 2024 21:10:49 -0500 Subject: [PATCH 3/3] ok i think that's everything --- _maps/map_files/IceMeta/IceMeta.dmm | 980 ++++++++++++++-------------- 1 file changed, 479 insertions(+), 501 deletions(-) diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index a8bca175efcc..41bee5866aa2 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -957,26 +957,6 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, /turf/open/floor/plasteel, /area/engine/atmos/distro) -"aoR" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/atmos/distro) "apf" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1867,6 +1847,20 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"aCh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "aCo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -4664,19 +4658,6 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) -"bsV" = ( -/obj/machinery/computer/security/telescreen/minisat{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) "bsW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -5345,6 +5326,24 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) +"bDF" = ( +/obj/machinery/light/small, +/obj/machinery/camera{ + c_tag = "MiniSat Exterior Access"; + dir = 1; + network = list("minisat","ss13") + }, +/obj/machinery/power/apc{ + areastring = "/area/aisat"; + name = "MiniSat Exterior APC"; + pixel_y = -23 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/turf/open/floor/plasteel/dark, +/area/aisat) "bDK" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -6860,6 +6859,20 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/secondary/command) +"cbp" = ( +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner, +/turf/open/floor/plasteel, +/area/engine/atmos) "cbw" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -7317,17 +7330,6 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/heads/cmo) -"chF" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/dark, -/area/aisat) "chQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7643,6 +7645,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"cmw" = ( +/obj/machinery/door/window{ + name = "MiniSat Walkway Access" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/aisat) "cmC" = ( /obj/machinery/door/poddoor{ id = "geo_turbine_nw"; @@ -11268,6 +11281,35 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison) +"dsR" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Foyer"; + req_one_access_txt = "32;19" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "dsX" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -13024,20 +13066,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/storage) -"dRJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "dRQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16534,6 +16562,16 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"eYA" = ( +/obj/machinery/computer/security/telescreen/minisat{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/ai) "eYJ" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/dark, @@ -17274,35 +17312,6 @@ /obj/machinery/portable_atmospherics/canister/bz, /turf/open/floor/plasteel, /area/engine/atmos) -"fjF" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Antechamber"; - req_one_access_txt = "32;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "fjK" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 @@ -18107,6 +18116,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"fvK" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/transit_tube/curved/flipped, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "fvM" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, /obj/machinery/portable_atmospherics/canister/air, @@ -18723,25 +18746,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/carpet, /area/bridge) -"fGz" = ( -/obj/machinery/camera{ - c_tag = "Virology - Entrance"; - dir = 8; - network = list("ss13","medbay") - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/green/filled/corner/lower{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/white, -/area/medical/medbay/aft) "fGA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -19159,16 +19163,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"fLD" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "fLH" = ( /obj/machinery/light{ dir = 8 @@ -21269,18 +21263,6 @@ "gnP" = ( /turf/open/floor/plasteel, /area/hydroponics/garden) -"gnQ" = ( -/obj/machinery/door/window{ - name = "MiniSat Walkway Access" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/blue/warning/lower, -/turf/open/floor/plasteel/dark, -/area/aisat) "gnS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22057,24 +22039,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) -"gzs" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "gzI" = ( /turf/open/floor/plasteel/showroomfloor, /area/security/main) @@ -22514,35 +22478,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/medical/virology) -"gHd" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Foyer"; - req_one_access_txt = "32;19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "gHe" = ( /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 1 @@ -24777,14 +24712,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/fore) -"hku" = ( -/obj/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/dark, -/area/aisat) "hkw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26019,6 +25946,27 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"hEi" = ( +/obj/machinery/camera{ + c_tag = "AI Chamber - Aft"; + dir = 8; + network = list("aicore") + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/ai) "hEv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -27148,27 +27096,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"hVa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "hVb" = ( /obj/machinery/light{ dir = 8 @@ -28714,6 +28641,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"iuV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/ai) "iuW" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/effect/spawner/structure/window/reinforced/shutter, @@ -29123,24 +29061,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"iAc" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/transit_tube/station{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "iAd" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -30010,6 +29930,17 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +"iNa" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "iNp" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -31151,24 +31082,6 @@ /obj/machinery/computer/shuttle/labor, /turf/open/floor/plasteel/dark, /area/security/brig) -"jdt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 4 - }, -/obj/machinery/doorButtons/access_button{ - idDoor = "ai_core_airlock_exterior"; - idSelf = "ai_core_airlock_control"; - pixel_x = 10; - pixel_y = -22 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) "jdw" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -32018,27 +31931,6 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) -"jqp" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/flasher{ - id = "AI"; - pixel_x = -32; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) "jqr" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -33983,6 +33875,16 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"jQX" = ( +/obj/structure/sign/warning/biohazard{ + pixel_x = -32 + }, +/obj/effect/turf_decal/trimline/green/filled/line/lower{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "jRa" = ( /obj/machinery/autolathe, /turf/open/floor/carpet, @@ -34165,6 +34067,26 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/engine/engineering) +"jUt" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/atmos/distro) "jUu" = ( /turf/open/floor/plasteel, /area/security/brig) @@ -36465,6 +36387,19 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"kCK" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/transit_tube/curved{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "kCL" = ( /obj/structure/chair{ dir = 1 @@ -36475,6 +36410,24 @@ "kCR" = ( /turf/closed/wall, /area/construction/storage_wing) +"kCT" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "kDc" = ( /obj/effect/landmark/stationroom/maint/tenxten, /turf/baseturf_bottom, @@ -36897,6 +36850,35 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison) +"kIh" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Antechamber"; + req_one_access_txt = "32;19" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "kIs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -38984,16 +38966,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"lpL" = ( -/obj/structure/sign/warning/biohazard{ - pixel_x = -32 - }, -/obj/effect/turf_decal/trimline/green/filled/line/lower{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel/white, -/area/medical/medbay/aft) "lpZ" = ( /obj/structure/bookcase/random/reference, /turf/open/floor/wood, @@ -39269,20 +39241,6 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"luY" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/transit_tube/curved/flipped, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "luZ" = ( /obj/structure/cable{ icon_state = "0-2" @@ -40478,6 +40436,21 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) +"lMC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/doorButtons/access_button{ + idDoor = "ai_core_airlock_exterior"; + idSelf = "ai_core_airlock_control"; + pixel_x = 10; + pixel_y = -22 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/ai) "lMR" = ( /obj/effect/turf_decal/trimline/brown/filled/corner/lower, /turf/open/floor/plasteel, @@ -40858,17 +40831,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"lSo" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "lSr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41397,6 +41359,25 @@ /obj/item/clothing/head/helmet/alt, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"lYv" = ( +/obj/machinery/camera{ + c_tag = "Virology - Entrance"; + dir = 8; + network = list("ss13","medbay") + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/green/filled/corner/lower{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "lYy" = ( /obj/structure/sign/warning/securearea{ desc = "A warning sign which reads 'SERVER ROOM'."; @@ -45460,6 +45441,18 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"ncI" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "ncZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50292,6 +50285,25 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"oxg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "oxp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -50567,6 +50579,24 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel/white, /area/medical/virology) +"oAR" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/transit_tube/station{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "oAY" = ( /obj/structure/sign/directions/medical{ pixel_y = 8 @@ -51158,19 +51188,6 @@ dir = 5 }, /area/crew_quarters/kitchen) -"oND" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/transit_tube/curved{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "oNM" = ( /turf/open/floor/plating/asteroid/snow/icemoon/top_layer, /area/solar/starboard/aft) @@ -51556,6 +51573,16 @@ /obj/machinery/rnd/server/master, /turf/open/floor/circuit/telecomms/server, /area/science/server) +"oUv" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "oUy" = ( /obj/structure/chair{ dir = 8 @@ -51903,24 +51930,6 @@ }, /turf/open/floor/engine/air, /area/engine/atmos/distro) -"oZN" = ( -/obj/machinery/light/small, -/obj/machinery/camera{ - c_tag = "MiniSat Exterior Access"; - dir = 1; - network = list("minisat","ss13") - }, -/obj/machinery/power/apc{ - areastring = "/area/aisat"; - name = "MiniSat Exterior APC"; - pixel_y = -23 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower, -/turf/open/floor/plasteel/dark, -/area/aisat) "oZQ" = ( /obj/machinery/airalarm{ dir = 1; @@ -54681,24 +54690,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/theatre) -"pQH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "pQO" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, @@ -56311,6 +56302,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"qpK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos/distro) "qpM" = ( /obj/structure/sign/directions/engineering{ dir = 4 @@ -63127,20 +63132,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"sry" = ( -/obj/structure/table, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner, -/turf/open/floor/plasteel, -/area/engine/atmos) "srI" = ( /obj/machinery/status_display/supply{ pixel_y = 32 @@ -64269,6 +64260,23 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) +"sFs" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/flasher{ + id = "AI"; + pixel_x = -32; + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/ai) "sFz" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -69249,20 +69257,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) -"ucO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos/distro) "ucS" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -69924,20 +69918,6 @@ }, /turf/open/floor/plasteel, /area/engine/foyer) -"uma" = ( -/obj/machinery/door/window{ - dir = 1; - name = "MiniSat Walkway Access" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/warning/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "umc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -70778,22 +70758,17 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) -"uyi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower, -/obj/machinery/light{ - dir = 8 +"uyh" = ( +/obj/machinery/door/window{ + dir = 1; + name = "MiniSat Walkway Access" }, -/obj/machinery/doorButtons/access_button{ - idDoor = "ai_core_airlock_interior"; - idSelf = "ai_core_airlock_control"; - pixel_x = 9; - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) +/area/aisat) "uyn" = ( /obj/structure/lattice, /obj/structure/grille, @@ -74015,6 +73990,27 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) +"vtr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "vts" = ( /obj/effect/turf_decal/trimline/green/warning, /turf/closed/wall/r_wall, @@ -74950,23 +74946,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"vGo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) "vGr" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -75688,6 +75667,24 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"vRc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "vRe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -75904,6 +75901,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/grimy, /area/chapel/office) +"vUa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/doorButtons/access_button{ + idDoor = "ai_core_airlock_interior"; + idSelf = "ai_core_airlock_control"; + pixel_x = 9; + pixel_y = 25 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/ai) "vUd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -76703,30 +76715,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) -"wfl" = ( -/obj/machinery/camera{ - c_tag = "AI Chamber - Aft"; - dir = 8; - network = list("aicore") - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner/lower{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai) "wfz" = ( /obj/machinery/photocopier, /obj/machinery/camera{ @@ -79934,18 +79922,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"wZP" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "wZY" = ( /obj/structure/chair/office/light{ dir = 8 @@ -80083,25 +80059,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"xcn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "xcD" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, /turf/open/floor/circuit/green/telecomms, @@ -80853,6 +80810,19 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower, /turf/open/floor/plasteel/white, /area/medical/virology) +"xnl" = ( +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) "xnp" = ( /obj/structure/closet/radiation, /turf/open/floor/plasteel/dark, @@ -84122,6 +84092,14 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/science/robotics/lab) +"ycR" = ( +/obj/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/turf/open/floor/plasteel/dark, +/area/aisat) "ycT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only{ @@ -237343,7 +237321,7 @@ okB lxx wLu xJi -lpL +jQX lxx gMl fFr @@ -237600,7 +237578,7 @@ fFw fjl aRC beQ -fGz +lYv sBO elA rsQ @@ -256570,7 +256548,7 @@ uqC jTo ipA sJN -sry +cbp oMh wRE jIJ @@ -257348,7 +257326,7 @@ hms ctq tRO weT -ucO +qpK hjv iQG nIs @@ -257599,7 +257577,7 @@ kyT xcS sJN gUo -hVa +vtr lFQ jIJ waM @@ -257860,7 +257838,7 @@ hML enq fAF bRV -aoR +jUt sVK tXc cim @@ -267357,9 +267335,9 @@ bqh iEX ozK mkm -luY -iAc -oND +fvK +oAR +kCK oET tRh iEX @@ -267614,9 +267592,9 @@ gVZ iEX uyn iEX -wZP +ncI uqw -oZN +bDF dML uOd jYF @@ -267871,9 +267849,9 @@ gHo iEX pnk jFT -lSo +iNa pVr -chF +xnl jnW pnk iEX @@ -268128,9 +268106,9 @@ nbb pJY nDh nDh -uma +uyh krX -gnQ +cmw nDh nDh pJY @@ -268385,9 +268363,9 @@ lHE dLB unR tcZ -fLD +oUv lRh -hku +ycR aoB unR tcZ @@ -268643,7 +268621,7 @@ tRh tRh tSE gpE -dRJ +aCh eys euQ tRh @@ -268900,7 +268878,7 @@ tRh tRh jYF jYF -gHd +dsR uZL jYF tRh @@ -269157,7 +269135,7 @@ tRh tRh eeG wuI -gzs +kCT diS jYF jYF @@ -269671,7 +269649,7 @@ tRh tRh imJ ckh -xcn +oxg pVY qoe bRk @@ -269928,7 +269906,7 @@ jYF jYF jYF aCS -fjF +kIh vSu qoe qoq @@ -270185,7 +270163,7 @@ mej aeQ kfW nXI -pQH +vRc kgu qoe iPP @@ -270438,8 +270416,8 @@ kfW piH rOv kfW -uyi -jdt +vUa +lMC kfW qpZ kYw @@ -270695,8 +270673,8 @@ kfW hiu jyh xVQ -jqp -vGo +sFs +iuV dWq baA hnc @@ -270952,8 +270930,8 @@ kfW piH npo kfW -wfl -bsV +hEi +eYA kfW eLc rbf