From 523897c17c3060888c2e085e40b2feaba65ee781 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sun, 7 Oct 2018 09:16:09 +0200 Subject: [PATCH 1/4] Dogborgs start with full water reserves. --- .../living/silicon/robot/robot_modules/station_vr.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 740cf1f20c..a0c9bb6bea 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -158,7 +158,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -228,7 +228,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -279,7 +279,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -333,7 +333,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += metal @@ -407,7 +407,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -482,7 +482,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water var/datum/matter_synth/wire = new /datum/matter_synth/wire() From 56ff73f57c8d14b1d7e75c067eefae6d74021d38 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sat, 13 Oct 2018 09:40:35 +0200 Subject: [PATCH 2/4] Makes water related changes shorter. --- .../silicon/robot/robot_modules/station_vr.dm | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index a0c9bb6bea..d26dc88ca9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -154,11 +154,9 @@ src.modules += new /obj/item/weapon/dogborg/pounce(src) //Pounce src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem. - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) //Starts full and has a max of 500 water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -224,11 +222,9 @@ src.modules += new /obj/item/weapon/shockpaddles/robot/hound(src) //Paws of life src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -275,11 +271,9 @@ src.modules += new /obj/item/weapon/dogborg/swordtail(src) src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -329,11 +323,9 @@ glass.recharge_rate = 0 glass.max_energy = 50000 glass.energy = 0 - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += metal @@ -403,11 +395,9 @@ src.modules += new /obj/item/weapon/storage/part_replacer(src) src.emag = new /obj/item/weapon/hand_tele(src) - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -478,11 +468,9 @@ plastic.recharge_rate = 50 plastic.max_energy = 50000 plastic.energy = 5000 - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water var/datum/matter_synth/wire = new /datum/matter_synth/wire() From 617f747763111db9c6569f7a69edd4727f60bfa1 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Wed, 17 Oct 2018 20:52:22 +0200 Subject: [PATCH 3/4] Fix aronai being LAZY --- maps/tether/tether-03-surface3.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 7ba93b95ce..64f70673f8 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -9670,7 +9670,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "qY" = ( -/obj/machinery/chem_master, +/obj/machinery/chem_master/condimaster, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "qZ" = ( From d2476e5043737beaa8c77a655e137e87e46587ca Mon Sep 17 00:00:00 2001 From: Hawk_v3 Date: Wed, 17 Oct 2018 22:46:09 +0100 Subject: [PATCH 4/4] Fixes to minor things around the station, also: * Piano outside the bridge. * RUST and Tesla engines should be more functional. Lightning rods for Tesla, RUST cooling control should now link to the vents and injectors correctly. * Cargo Sealed Airlock now has access and control setup, should work when the rest of the fixes are made. * All arrivals points now have emergency wall lockers with crowbars in. --- .../crates_lockers/closets/walllocker.dm | 2 +- maps/submaps/engine_submaps/engine_rust.dmm | 25 +++++------ maps/submaps/engine_submaps/engine_tesla.dmm | 6 +-- maps/tether_yw/tether-01-surface1_yw.dmm | 7 +-- maps/tether_yw/tether-05-station1_yw.dmm | 24 +++++----- maps/tether_yw/tether-06-station2_yw.dmm | 23 +++++----- maps/tether_yw/tether-07-station3_yw.dmm | 45 ++++++++++--------- 7 files changed, 68 insertions(+), 64 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index 78572d38cd..526f12ec26 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -16,7 +16,7 @@ /obj/structure/closet/walllocker/emerglocker name = "emergency locker" desc = "A wall mounted locker with emergency supplies." - var/list/spawnitems = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/clothing/mask/breath,/obj/item/weapon/tool/crowbar/red) + var/list/spawnitems = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/clothing/mask/breath,/obj/item/weapon/tool/crowbar/red,/obj/item/device/flashlight/flare,) var/amount = 2 // spawns each items X times. icon_state = "emerg" diff --git a/maps/submaps/engine_submaps/engine_rust.dmm b/maps/submaps/engine_submaps/engine_rust.dmm index 81c830ad09..077c98a2b4 100644 --- a/maps/submaps/engine_submaps/engine_rust.dmm +++ b/maps/submaps/engine_submaps/engine_rust.dmm @@ -1,7 +1,7 @@ "aa" = (/turf/template_noop,/area/template_noop) "ab" = (/turf/space,/area/space) "ac" = (/obj/item/weapon/book/manual/rust_engine,/turf/template_noop,/area/template_noop) -"ad" = (/obj/machinery/computer/general_air_control/supermatter_core{dir = 1; frequency = 1438; input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; pressure_setting = 100; sensors = list("engine_sensor" = "Engine Core"); throwpass = 1},/turf/template_noop,/area/template_noop) +"ad" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1323; id = "rust_injector"; unacidable = 1; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "ae" = (/obj/structure/grille,/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 2},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 1},/obj/machinery/door/blast/radproof{dir = 1; id = "EngineShroud"},/obj/structure/window/phoronreinforced/full{icon_state = "phoronwindow0"},/turf/simulated/floor,/area/engineering/engine_room) "af" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/engineering/engine_room) "ag" = (/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/hatch{icon_state = "door_locked"; id_tag = "engine_access_hatch"; locked = 1; name = "Fusion Core Access"; req_access = list(11)},/obj/machinery/door/blast/radproof{dir = 1; id = "EngineShroud"},/turf/simulated/floor,/area/engineering/engine_room) @@ -13,7 +13,7 @@ "am" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engineering/engine_room) "an" = (/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "ao" = (/obj/structure/grille,/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 1},/obj/machinery/door/blast/radproof{dir = 1; id = "EngineShroud"},/obj/structure/window/phoronreinforced/full{icon_state = "phoronwindow0"},/turf/simulated/floor,/area/engineering/engine_room) -"ap" = (/turf/space,/area/engineering/engine_smes) +"ap" = (/obj/machinery/air_sensor{frequency = 1323; id_tag = "engine_sensor"; output = 63},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "aq" = (/turf/simulated/floor,/area/engineering/engine_room) "ar" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/radproof/open{dir = 4; id = "ControlRMS"; name = "Control Room Shroud"},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor,/area/engineering/engine_room) "as" = (/obj/structure/table/reinforced,/obj/fiftyspawner/deuterium,/turf/simulated/floor,/area/engineering/engine_room) @@ -41,17 +41,16 @@ "aO" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/space,/area/space) "aP" = (/obj/machinery/power/fusion_core/mapped{id_tag = "engine"},/obj/structure/cable/cyan,/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "aQ" = (/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/obj/machinery/camera/network/engine{dir = 8},/turf/simulated/floor,/area/engineering/engine_room) -"aR" = (/obj/machinery/atmospherics/unary/outlet_injector{unacidable = 1; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) -"aS" = (/obj/machinery/air_sensor{frequency = 1438; id_tag = "engine_sensor"; output = 63},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) -"aT" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) +"aR" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1323; id_tag = "rust_extractor"; pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) +"aS" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1323; id = "rust_injector"; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) +"aT" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1323; id = "rust_injector"; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "aU" = (/obj/machinery/camera/network/engine,/obj/machinery/button/remote/airlock{id = "engine_access_hatch"; name = "Door Bolt Control"; pixel_x = -4; pixel_y = 28; req_access = list(10); specialfunctions = 4},/turf/simulated/floor,/area/engineering/engine_room) "aV" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor,/area/engineering/engine_room) -"aW" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) +"aW" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1323; id_tag = "rust_extractor"; pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "aX" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow,/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) -"aY" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) -"aZ" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) +"aY" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1323; id_tag = "rust_extractor"; pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) +"aZ" = (/obj/machinery/computer/general_air_control/supermatter_core{dir = 1; frequency = 1323; input_tag = "rust_injector"; name = "Engine Cooling Control"; output_tag = "rust_extractor"; pressure_setting = 100; sensors = list("engine_sensor" = "Engine Core"); throwpass = 1},/turf/template_noop,/area/template_noop) "ba" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/red,/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) -"bb" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "bc" = (/turf/simulated/wall/r_wall,/area/template_noop) "bd" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow,/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) "be" = (/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/floor/reinforced/airless,/area/engineering/engine_room) @@ -201,18 +200,18 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaabababababababababababababababababababababababababababaaaa aaabababababababababababababababababababababababababababaaaa aaaiaiaiaiaiajaiaiaiakakakakalakakakakakakakakakakamababaaaa -aaaiababababajapababakanananananananaeaUafaqasatauakababaaaa +aaaiababababajabababakanananananananaeaUafaqasatauakababaaaa aaaiabavawawaxawawayakanananazaAaAaAagaCaDaqaqaqaqakababaaaa aaajajaFaGaxaxaxaxaHakanananaIanananaoaJaKaqaqaqaqakababaaaa aaaiabaNaOawaxawawayakanananaPanananbgaJaKaqaqaqaqakababaaaa -aaaiajaFaGaxaxaxaxaHakanaRanaSanaTanbgaJaKaqaqaqaqakababaaaa -aaaiabaNaOawaxawawayakaWaXaYanaZbabbbgaqaKakaraBaEbcbcbcaaaa +aaaiajaFaGaxaxaxaxaHakanadanapanaRanbgaJaKaqaqaqaqakababaaaa +aaaiabaNaOawaxawawayakaSaXaTanaWbaaYbgaqaKakaraBaEbcbcbcaaaa aaaiajaFaGaxaxaxaxaHakanbdanananbeanbhaqaKaMbfaqbubcaaaaaaaa aaaiabaNaOawaxawawayakbzbAbBbBbBbJbXcdaqaKaMaLaqaQbcaaaaaaaa aaaiajaFaGaxaxaxaxaHakdxbpbjbqbjbrdyakaqbmdCbiaCbnboaaaaaaaa aaaiabaNaOawaxawawayakdwdDdEdFdEdGdHdAaCbsaMahaqbtboaaaaaaaa aaaiajaFaGaxaxaxaxaHakaVbpbqbqbqbrbqaqaqdNakdIdIdJbcbcbcaaaa -aaaiabaNaOawaxawawayakdBbkaqaqaqbvbwbwbwbwbxaqaqbydKacadaaaa +aaaiabaNaOawaxawawayakdBbkaqaqaqbvbwbwbwbwbxaqaqbydKacaZaaaa aaajajaFaGaxaxaxaxaHakbCbDbEbFbFbFbFbFbFbFbGbFbHbIdLaaaaaaaa aaajajaFbKaxaxaxaxbLbMbNbObObPbQbRbRbSbTbUbVblbkbWdLaadMaaaa aaaiabaNavawaxawawbYbZcacbcccccbaqaqdzcecfcgchbkcidLaaaaaaaa diff --git a/maps/submaps/engine_submaps/engine_tesla.dmm b/maps/submaps/engine_submaps/engine_tesla.dmm index 415b6de6b6..b59be117c9 100644 --- a/maps/submaps/engine_submaps/engine_tesla.dmm +++ b/maps/submaps/engine_submaps/engine_tesla.dmm @@ -156,11 +156,11 @@ aaacababababcDabababababcDabababababcEaJaKaLaMaNaOaaaaaaaaaa aaacababababadabababababadabababababcEaQaRaSaUaVaWaaaaaaaaaa aaacadadadajcocKcKaIcKcKaIcLababababcEaGbabbbcaZbeaaaaaaaaaa aaacabababajadadadadadadadcNabaYbPbPbhbibjbibibkblbmbmaaaaaa -aaacabababajadaXadadadaXadcNabbnbobfbqbrbsbtbibkaEaabubvaaaa +aaacabababajadaXadadadaXadcNcDbnbobfbqbrbsbtbibkaEaabubvaaaa aaacabababajadadajajajadadcNadbnbwbxbybzbAbBbCbDaEaaaaaaaaaa -aaacabababajadadajbEajadadaPcKbFbQbGbHbIbJbKbLbMbNaaaabOaaaa +aaacabcDadajadadajbEajadadaPcKbFbQbGbHbIbJbKbLbMbNaaaabOaaaa aaacabababajadadajajajadadcNadbnbWbRbSbTbUbVbCbDaEaaaaaaaaaa -aaacabababajadaXadadadaXadcNabbnbXcacacdcGbYbibkaEaaaaaaaaaa +aaacabababajadaXadadadaXadcNcDbnbXcacacdcGbYbibkaEaaaaaaaaaa aaacabababajadadadadadadadcNabbdcmcmbhbicHbibibkcbbmbmaaaaaa aaacadadadajcocKcKaIcKcKaIcQababababcEaHcIcecfcgbaaaaaaaaaaa aaacababababadabababababadabababababcEccchaTcjckclaaaaaaaaaa diff --git a/maps/tether_yw/tether-01-surface1_yw.dmm b/maps/tether_yw/tether-01-surface1_yw.dmm index 08156dd8dd..1707c0ac85 100644 --- a/maps/tether_yw/tether-01-surface1_yw.dmm +++ b/maps/tether_yw/tether-01-surface1_yw.dmm @@ -43,7 +43,9 @@ "aaQ" = (/obj/machinery/embedded_controller/radio/airlock/phoron{id_tag = "mining_airlock"; pixel_x = 25},/obj/machinery/airlock_sensor/phoron{id_tag = "mining_airlock_sensor"; pixel_x = 25; pixel_y = 11},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/turf/simulated/floor/tiled,/area/tether/surfacebase/mining_main/airlock) "aaR" = (/obj/machinery/mineral/unloading_machine,/turf/simulated/floor/tiled/techfloor,/area/tether/surfacebase/mining_main/refinery) "aaS" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery) +"aaT" = (/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram,/obj/machinery/status_display{pixel_y = 30},/turf/simulated/floor/tiled,/area/tether/surfacebase/tram) "aaU" = (/turf/simulated/wall,/area/maintenance/lower/trash_pit) +"aaV" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/effect/landmark/tram,/obj/structure/closet/walllocker/emerglocker/north,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram) "aaX" = (/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 2; id = "mining_interior"},/turf/simulated/floor/plating,/area/tether/surfacebase/mining_main/refinery) "aaY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "mining_airlock_inner"; locked = 1},/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/mining_main/airlock) "aaZ" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "mining_airlock_inner"; locked = 1},/turf/simulated/floor/tiled/steel_grid,/area/tether/surfacebase/mining_main/airlock) @@ -1666,7 +1668,6 @@ "bfC" = (/obj/machinery/camera/network/northern_star,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram) "bfF" = (/obj/machinery/status_display{pixel_y = 30},/turf/simulated/floor/tiled,/area/tether/surfacebase/tram) "bfI" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/effect/landmark/tram,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram) -"bfL" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/machinery/status_display{pixel_y = 30},/obj/effect/landmark/tram,/turf/simulated/floor/tiled,/area/tether/surfacebase/tram) "bfN" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/rnd/hallway) "bfP" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/obj/structure/table/glass,/obj/machinery/chemical_dispenser/full,/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora) "bfR" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/mauve/border{dir = 1},/obj/machinery/camera/network/research,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora) @@ -2520,9 +2521,9 @@ aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahamUarqarpaTLar aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahaahamUaUEarpaTLarZasaasbascasdaseaseasfasgaUHasiasjaUIaslakoaUKarGarGaVaaVlarGaspaVsaVuaVtaVuaVuaVuaVuaVuaVuaVuaVDaVPaVMalgaahaahaahaahaahaahaahaahaahaahaahaahaahalgaqnaqnaqnagMaswaBzajUakDakEakEakEakEakEakEakEakEakEakDajUatsatraufaueauhaugauTauSauVauUauXauWauYatpaahapPaWNarmasHasIasJarmaqCaqDarWarVarWarWarWarWarVarWasKapPaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahaahamUarqarpaWRaWPaWPaWPaWPaWPaWPaXbaXdaXcaXDaXjasUasVasWasXasYarGaXFaXEaXHaXGaXSaXQatfatfatfatfatfatfatfatfatfatfatgaXZatiatiatjatjatjatjatjatjagMagMaahaahaahaahagMagMagMaqnagMaYaaBzbuhajUajUajUajUajUajUajUajUajUajUajUbuhavaauZatpavRavUavTawMawLawQawNawSawRaydatpaahapPbJLattattarmatuarmaqCaqDarWarVarWarWarWarWarVarWaTIaYNaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahamUamUamUamUaYQarsatxasLatyaYRatAaYZaplatCatDaZdatFatGatHatIatJarGaZhatLatLatLatLaZjatfaZlaZoatPatQatRtecatRatSatfaZzaZwatiaZBatWatWatWatWatWatWagMagMagMaahaahaahagMahcagMaqnagMatXaZNaZKsRisRisRisRisRiaubsRisRisRisRisRisRiaLiazQaLpaLnaLJaLJaLJaLJatpaMhawSaMyaOfatpaahapPapPapPapPaujatuarmaqCaqDarWarVarWarWarWarWarVarWaqGapPaadaadaadaadaadaadaadaadaadaadaaa -aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahaahamUaulaumasMaunarsaukatwaveamUauobaZbbfamUaurbbnarGarGarGarGarGarGbbvauuauuauuauuauuatfauvauwauxauyauzauzauzauAatfauBbbQbcdbccatWauFauFauFauFatWaWebLYagMagMagMagMagMahuagMapFagMauIaBzauJauKbcAauMauMauNauObcCbcBauMauMauMauRavaakFaQKaOFaQMaQMaQMaQMaLJaSTaTgaTfaThatpaahapPavbavbapPavcatuarmaqCaqDarWarVarWarWarWarWarVarWaqGapPaadaadaadaadaadaadaadaadaadaadaaa +aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahaahamUaulaumasMaunarsaukatwaveamUauobaZbbfamUaurbbnarGarGarGarGarGarGbbvauuauuauuauuauuatfauvauwauxauyauzauzauzauAatfauBbbQbcdbccatWauFauFauFauFatWaWebLYagMagMagMagMagMahuagMapFagMauIaBzauJauKbcAauMauMauNauObcCbcBauMauMauMauRavaakFaQKaOFaQMaQMaQMaQMaLJaSTaTgaTfaThatpaahapPavbaaTapPavcatuarmaqCaqDarWarVarWarWarWarWarVarWaqGapPaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahaahamUavdarsarsaunarsaoFavfbcKamUauobcLbcQamUbcVbcRbcWaVuaVuaVuaVubcXavmauuavnbcYbcZavqavravsavtavubdaavwavwavwbdjatfavyavzatiavAatWauFauFauFauFauFblzavCbdsavEavFbdxavHavIavJavKavLavMbdNbdLagMagMavPavPavPavPavPavPavQavPavPaTiaWJaTkaLJaLJaLJaLJatpaYfatpatpatpatpatpaYAagMapPavVavVapPavWavXarmaqCaqDarWarVarWarWarWarWarVarWaTIapPaadaadaadaadaadaadaadaadaadaadaaa -aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahamUavYbedbdYawbawcaoFaxhaxiamUaweawfawgamUbegbeeauuauuauuauuauuauuauuauuawjbeibekbejbetbembewbevbeFbeAbeAbeQbeTatfawvavzatiavAatWauFauFauFauFauFblzavBaxFawwavBavBawxavBbfcauaawzawAbffbfeamwahcavPawDawEawFawGbzfawIbfnavPawKbaraZTbdVbaBawPawYbivbiuawTbftbfAbfvawXawYawObAebfIbfIbfLaxcaxdarmaqCaxearWarVarWarWarWarWarVarWaqGapPaadaadaadaadaadaadaadaadaadaadaaa +aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahamUavYbedbdYawbawcaoFaxhaxiamUaweawfawgamUbegbeeauuauuauuauuauuauuauuauuawjbeibekbejbetbembewbevbeFbeAbeAbeQbeTatfawvavzatiavAatWauFauFauFauFauFblzavBaxFawwavBavBawxavBbfcauaawzawAbffbfeamwahcavPawDawEawFawGbzfawIbfnavPawKbaraZTbdVbaBawPawYbivbiuawTbftbfAbfvawXawYawObAebfIbfIaaVaxcaxdarmaqCaxearWarVarWarWarWarWarVarWaqGapPaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaahaxfaxfaxfaxfaxfaxfaxfaxfaxfaxfaxfaxfaxfaxfbfNbeeauuaxjbfRbfPazVaxlaxmaxnaxoaxpbfUaxravrbfXbgbaxuaxvbgcaxxbgdaxzbgeaxBaxCatiavAatWaxDauFauFauFaxEbAAaxGaxHaxIaxJbgAaxLaxMaxNbgIbgQbgLbgUaxSagMagMavPbgZaxUaxVaxVaxWaxXbhbaxZayaclcawAaybcldauaaycbhiauaayeauaauaawAauaauaayfaygayhayiayjaygbhjarmaqCaxearWarVarWarWarWarWarVarWaqGaYNaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaharGbhkbhsbhpbhpbhtbhpbhwbhybhpbhpbhybhpbhFaysbeeauubhGayuayvaywayxaywaywaywaywbhNayzavrbhPayBayCayDayEayFayGayHatfalgayIatiayJatWatWatWatWatWatWbMKbPIagMagMagMagMagMayMbimayOagMagMagMagMagMaahavPbipayQayRaySayTayUayYbisayZcleazbazeclfazPazgaBpclgaBqazfazfazhaziazfazfbRyazmazlbiDaznazoarmaqCaxearWarVarWarWarWarWarVarWaqGapPaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaharGazpazrazrazrazrazrazrazrazrazrazrazrazrazsbiEauubiFaxpazvazwazxazxazxazyazzbiIbiHatfatfatfavravrazCatfatfatfatfaahazDatiatiatjatjatjatjatjatjagMagMagMazEazFazGazHazIbjnazIaahaahaahaahaahaahavPazKazLazMazMavPazNbjwavPagMagMagMagMagMagMagMbjUbjRagMaCcaCcaCcagMayObREapPazRazRapPavWazSarmaqCaqDarWarVarWarWarWarWarVarWaTIapPaadaadaadaadaadaadaadaadaadaadaaa diff --git a/maps/tether_yw/tether-05-station1_yw.dmm b/maps/tether_yw/tether-05-station1_yw.dmm index c50f251aa3..be81557e03 100644 --- a/maps/tether_yw/tether-05-station1_yw.dmm +++ b/maps/tether_yw/tether-05-station1_yw.dmm @@ -29,6 +29,7 @@ "aaC" = (/obj/machinery/power/grid_checker,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/engineering/engine_smes) "aaD" = (/turf/simulated/shuttle/floor/black,/area/shuttle/excursion/tether) "aaE" = (/turf/simulated/floor/reinforced,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/excursion/tether) +"aaF" = (/obj/structure/device/piano,/turf/simulated/floor/wood,/area/hallway/station/atrium) "aaG" = (/obj/machinery/power/smes/buildable{charge = 2e+007; cur_coils = 4; input_attempt = 1; input_level = 500000; output_level = 1e+006; RCon_tag = "Power - Main"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/engineering/engine_smes) "aaH" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "aaI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) @@ -37,14 +38,17 @@ "aaL" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/power/sensor{name = "Powernet Sensor - Master Grid"; name_tag = "Master"},/turf/simulated/floor,/area/engineering/engine_smes) "aaM" = (/obj/structure/bed/chair/shuttle,/turf/simulated/shuttle/floor/black,/area/shuttle/excursion/tether) "aaN" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/turf/simulated/floor/tiled,/area/engineering/hallway) +"aaO" = (/obj/machinery/light{dir = 1},/obj/structure/table/reinforced,/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/obj/item/weapon/storage/backpack/parachute,/turf/simulated/floor/tiled,/area/engineering/engine_eva) "aaP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "aaQ" = (/obj/machinery/door/blast/regular{dir = 4; icon_state = "pdoor1"; id = "EngineVent"; name = "Reactor Vent"; p_open = 0},/turf/simulated/floor/reinforced/nitrogen{nitrogen = 82.1472},/area/engineering/engine_room) "aaR" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/button/remote/airlock{id = "engine_electrical_maintenance"; name = "Door Bolt Control"; pixel_x = -25; pixel_y = 0; req_access = list(10); specialfunctions = 4},/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) "aaS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/table/reinforced,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "aaT" = (/turf/simulated/wall,/area/hallway/station/atrium) +"aaU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/structure/door_assembly/door_assembly_eng,/obj/structure/barricade,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) "aaV" = (/turf/simulated/wall/r_wall,/area/crew_quarters/sleep/engi_wash) "aaW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "aaX" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) +"aaY" = (/obj/effect/floor_decal/techfloor{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) "aaZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "aba" = (/obj/machinery/light{dir = 1},/obj/structure/table/rack/shelf,/obj/item/weapon/tank/oxygen,/obj/item/device/suit_cooling_unit,/obj/item/clothing/head/helmet/space/void/pilot,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/pilot,/obj/item/clothing/head/helmet/space/void/pilot,/turf/simulated/shuttle/floor/black,/area/shuttle/excursion/tether) "abb" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/table/steel,/obj/item/weapon/paper{info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info"},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) @@ -62,6 +66,7 @@ "abn" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower) "abo" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/maintenance/station/eng_lower) "abp" = (/obj/machinery/shuttle_sensor{dir = 6; id_tag = "shuttlesens_exp_int"},/turf/simulated/shuttle/wall/voidcraft,/area/shuttle/excursion/tether) +"abq" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor/hole,/obj/machinery/camera/network/engineering{dir = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) "abr" = (/obj/structure/cable/cyan{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) "abs" = (/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/hatch{icon_state = "door_locked"; id_tag = "engine_electrical_maintenance"; locked = 1; name = "Electrical Maintenance"; req_access = list(10)},/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) "abt" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) @@ -72,6 +77,7 @@ "aby" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/turf/simulated/floor/tiled,/area/engineering/hallway) "abz" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/maintenance/common,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/hallway/station/atrium) "abA" = (/obj/effect/floor_decal/rust,/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/station/eng_lower) +"abB" = (/obj/effect/floor_decal/techfloor{dir = 6},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) "abC" = (/turf/simulated/wall,/area/maintenance/station/eng_lower) "abD" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) "abE" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/hatch{icon_state = "door_locked"; id_tag = "engine_electrical_maintenance"; locked = 1; name = "Electrical Maintenance"; req_access = list(10)},/turf/simulated/floor/tiled/techmaint,/area/engineering/engine_smes) @@ -104,6 +110,7 @@ "acf" = (/obj/structure/railing{dir = 4},/obj/structure/railing,/mob/living/simple_animal/fish/koi/poisonous,/turf/simulated/floor/water/pool,/area/hallway/station/atrium) "acg" = (/turf/simulated/wall/r_wall,/area/engineering/engine_gas) "ach" = (/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/station/eng_lower) +"aci" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/techfloor,/obj/structure/closet/walllocker/emerglocker/south,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/cryo) "acj" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/station/eng_lower) "ack" = (/turf/simulated/floor,/area/maintenance/station/eng_lower) "acl" = (/obj/random/junk,/turf/simulated/floor,/area/maintenance/station/eng_lower) @@ -897,7 +904,6 @@ "aAR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/machinery/door/window/northleft{dir = 2; name = "Atmospherics Hardsuits"; req_access = list(24)},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/atmos,/turf/simulated/floor/tiled,/area/engineering/engine_eva) "aAS" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/southleft{name = "Jetpack Storage"; req_access = newlist(); req_one_access = list(11,24)},/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/item/weapon/tank/jetpack/carbondioxide,/turf/simulated/floor/tiled,/area/engineering/engine_eva) "aAT" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/machinery/door/window/northright{dir = 2; name = "Atmospherics Hardsuits"; req_access = list(24)},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/atmos,/turf/simulated/floor/tiled,/area/engineering/engine_eva) -"aAU" = (/obj/machinery/light{dir = 1},/obj/structure/table/reinforced,/obj/item/device/radio/intercom{dir = 1; pixel_y = 24; req_access = list()},/turf/simulated/floor/tiled,/area/engineering/engine_eva) "aAV" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/hallway/station/docks) "aAW" = (/turf/simulated/wall,/area/crew_quarters/sleep/engi_wash) "aAX" = (/obj/structure/bed/chair,/obj/machinery/camera/network/northern_star,/turf/simulated/floor/tiled,/area/hallway/station/docks) @@ -1323,7 +1329,6 @@ "aXl" = (/obj/item/weapon/stool/padded,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/holodeck_control) "aXw" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled,/area/holodeck_control) "aXy" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/camera/network/civilian{dir = 8},/turf/simulated/floor/tiled,/area/holodeck_control) -"aXC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/hatch{name = "Server Room"; req_access = list(59); req_one_access = list(19)},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) "aXR" = (/obj/structure/window/basic{dir = 1},/obj/machinery/button/remote/driver{id = "enginecore"; name = "Emergency Core Eject"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/heads/chief) "aXX" = (/obj/structure/table/reinforced,/obj/item/weapon/deck/cards,/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) "aXY" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass_engineering{name = "Engineering Lobby"; req_one_access = newlist()},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer) @@ -1353,7 +1358,6 @@ "baI" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/hallway/station/atrium) "baQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/cryo) "baT" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/crew_quarters/sleep/cryo) -"baV" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor/hole,/obj/machinery/camera/network/engineering{dir = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/telecomms/relay/preset/tether/station_mid,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) "bbd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/vacant/vacant_restaurant_lower) "bbl" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/cap/hidden/supply{dir = 4},/turf/simulated/floor,/area/vacant/vacant_restaurant_lower) "bbn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/steel_grid,/area/hallway/station/atrium) @@ -1810,8 +1814,6 @@ "bYC" = (/turf/simulated/floor,/area/hallway/station/docks) "bYD" = (/obj/machinery/door/airlock/multi_tile/glass,/turf/simulated/floor,/area/hallway/station/docks) "bYE" = (/obj/machinery/recharge_station,/turf/simulated/floor/carpet,/area/engineering/foyer) -"bYJ" = (/obj/effect/floor_decal/techfloor{dir = 10},/obj/machinery/telecomms/relay/preset/tether/station_high,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) -"bYK" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/machinery/telecomms/relay/preset/tether/station_low,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief) "bYN" = (/obj/item/device/instrument/violin,/turf/simulated/floor,/area/vacant/vacant_restaurant_lower) "bYP" = (/turf/simulated/wall,/area/vacant/vacant_restaurant_lower) "bYR" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/vacant/vacant_restaurant_lower) @@ -2025,23 +2027,23 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaah aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaahVaaaaaaahWaoharlarnawkaswaszasyaqMasAaenaenaenaenaenasUasUatAawBacSawMawDarHawOapgatdapQawRapQapQapQawTaijavPaiXaikaaeaaeaikajHackackackackackachackackackackabzacmaxyacmdxXaxIaaTnOlxhjvIvxhjheAnYMmCPtNStEurRnlNstEueUxmFoafTggiaataataataaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaahWabZabZarkaxBaxAaxHaxGaqMbkxaxPaxObZcatQbZdatNatSaxUaxYaxWatXatWarHaybapgatYatZawRayiauaalsaucaijaysabCaikaikaikaikakuabCaaTaaTaaTaaTaaTaaTaaTaaTaaTaaTaaTayVabhbOaaaTaaTjQQllPllPllPeJLnYMepzlHzwmCjopjoppIqceMjtjixkwSkaataataataataaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVahWahWahWahWabZaueaueaueaueaueaqMaqMaqMaqMacSaukaenaulazeaenaenaqNauwauvauyazfaijauzauzazkauzauzauzauzaijavPanEachazDazBazBazEazJazIazXazLaAcaAbaAiaAeaAnaAlaAsaApaAwaAtaABaAzaADaAtaAFaAEaALaAHashashashashashashashashashashashashaacaacaataaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaAQavfavfatOaARaATaASaBlaAUaBpaBmavsaBqaqNbZiafUasUasUaenawlaByatXawnaBBaBAaAWaBCaBXaBDaBEaAWaDIaDDaaVavPalQaBHaBRalQalTalTalTalTaCaabXacnacmaCeacpacpacpacpacpacpacpaQLaCmacpacpacpactaCxaCwaCyamgamgamgamgamgamgamgamgamgamgalAamhaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaAQavfavfatOaARaATaASaBlaaOaBpaBmavsaBqaqNbZiafUasUasUaenawlaByatXawnaBBaBAaAWaBCaBXaBDaBEaAWaDIaDDaaVavPalQaBHaBRalQalTalTalTalTaCaabXacnacmaCeacpacpacpacpacpacpacpaQLaCmacpacpacpactaCxaCwaCyamgamgamgamgamgamgamgamgamgamgalAamhaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaCBaCBatOauAauAauAauBaJlaCEauAauAaJwaCMaJxaenasUasUaCPaCQacSaCTaCRaKtaCVaAWaAWaAWaKNaLjaKUaLlaDjaaVapUalQaDsaDMalQasuaDPamEalTaDVacwacyacyacyacyacyacyacyacmacmacyacyacUacyacyacyacyacWaDZamMamgamgamgamgamgamgamgamgamgamgamNamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaEaaLIatOaEbauAauAavjaLXaEfauAauAaJwaCMaJxaMZaMBaNbaNaaenaqNaEzaExaKtaEAaAWaEEaBXaOLaEMaAWaETaERaaVapUaBHaEWaEXalQaFcaEZaFfaFeaFhacmacyadEacZacyacyacTacyacmacmacyacTacUacyadEacZacyadHaFzamMamgamgamgamgamgamgamgamgamgamgaFIamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaFKaFJatOaFLaFOaFLaFOaQvaFXbZtcalcakaqNaQZaQZaRwaRAaRyaRyaqNaEzaCRaKtaGsaAWaAWaAWaRZaGxaaVaaVaaVaaVaGyaGPaGIaofalQaogavSaoialTaHbacmacyadMacfacyacyacyacyacmacmacyacyacUacyadMacCacyadHaHzamMamgamgamgamgamgamgamgamgamgamgalAamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaHTaHQatOatOaSCaSCaSCaSCaHYaSCaSCaSCacSaqNaqNaByaIfaqNaqNacSaEzaIiaKtaIlaAWaBCaBXaTiaInaaVatpaIoaIqaIpalQalQalQalQaoOaoOalTalTaIsacmacyacyacyacyacDacEacDacmacmacDacEacFacyacyacyacyadHaITaoVamgamgamgamgamgamgamgamgamgamgalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaJhaJkaJjaJnaJmbdsaoqaTKaTJaJyaTLaoqaoqaJSaoqaUlaTQaUoaUnaTKaUpaUlatWaKtaKbaAWaAWaAWaUUaKlaaVapiaKraUXaKzaeqaeqaeqaeqaeqaeqaesaeraeMacmacyacyacyacGacHacHacHacHacHacHacHacIacKacyacyacyadHaKQaLcamgamgamgamgamgamgamgamgamgamgalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaJhaJkaLpaLtaLraLAaLyaLGaLCaLKaLHaLOaLLaLUaLPaMaaLYaMdaMcaMgaLUaLPaMhaMkaMjaAWaMlaBXaUUaMpaaVaMtaMraMxaMuaeqaeOaeOaeOaeOaeqaePacmadHacmacyacyacyacYacHacHacHadaadaacHacHacHadbacyacyacyadHaMLamMamgamgamgamgamgamgamgamgamgamgalAamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaJhaJkaJjaJnaJmbdsaoqaTKaTJaJyaTLaoqaoqaJSaoqaUlaTQaUoaUnaTKaUpaUlatWaKtaKbaAWaAWaAWaUUaKlaaVapiaKraUXaKzaeqaeqaeqaeqaeqaeqaesaeraeMacmacyacyacyacGaaFacHacHacHacHacHacHacIacKacyacyacyadHaKQaLcamgamgamgamgamgamgamgamgamgamgalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaJhaJkaLpaLtaLraLAaLyaLGaLCaLKaLHaLOaLLaLUaLPaMaaLYaMdaMcaMgaLUaLPaMhaMkaMjaAWaMlaBXaUUaMpaaVaMtaMraMxaMuaeqaeOaeOaeOaeOaeqaePacmadHacmacyacyacyacYadnacHacHadaadaacHacHacHadbacyacyacyadHaMLamMamgamgamgamgamgamgamgamgamgamgalAamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaNeaNdaRbaRbaNgaNgaNgaNgaNoaNgaRbaRbaltaltaNraltaltalvaXZaXZaXZaNFaNHaXZaoJaoJaoJaaVaaVaaVaqsaqtaOjaYfaeqaeOaeOaeOaeOaeOaeUacmadHacmacmacmacmacmacHacHadcaddadkadlacHacHacmacmacmacmadHaFzamMamgamgamgamgamgamgamgamgamgamgaOOamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaGBaGBaRbaYEaYHaYFaYJaBgaOSaRVaZgaRbaOYaOWaPaalyalIaltaoGaZraZUaPjaZWaBwaPqbePbYEaoJaacaikaPGarbaPHardaeqaeOaeOaeOaeOaeOaeUacmadHacmacmacmacmacmacHacHadcadmadmadlacHacHacmacmacmacmadHaCwamMamgamgamgamgamgamgamgamgamgamgarhamhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWahWahWahWaQcaQaaRVaRXbaAaTmaQkaQhaQlaRbaQsaQnaQwalXamYaltbbsaQDbbxaQJaQWaQQaQXaQXaRcaoJaacaikaRiarAaRrarCaeqaeOaeOaeOaeOafyafzacmadHacmacyacyacyacYacHacHacHadnadnacHacHacHadbacyacyacyadHaCwamMamgamgamgamgamgamgamgamgamgamgalAamhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaQcaSabcpaSebcnbcrbcwaRVaSuaRbandamZasSanQawmaSzbeJaSDbeLaSFbeNbeMbfobYtaSLaoJaacaikarZasaaSOascaeqaeqaeqaeqaeqaeqafAacmadHacmacyacyacyacGacHacHacHacHacHacHacHacHacKacyacyacyadHaTAashashashashashashashashasiamMasialAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaQcbftbfvaRXaTRaRXbfTaRVaTWaRbaTXaIOaIOaSBaXXaltaoIaUkbgCaUmbgEbgDaoIbgFaoJaeiaacaikaUEasDaUIaUFafCafCafCafCafCafCafDacmadHacmacyacyacyacyadxadyadxacmacmadxadyadxacyacyacyacyadHaCwasIasJasKasLaSoasNasOasIasPasQaVxalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaRbbhjbnwaVzaVBbnIaVHaVGaBgaRbaVNaVKaVWaVPaZnaltaTEbXGbXIaWdbXKbXJaoIbgFaoJaacaacaikaqsatoaWjatqafCafEafJafFafNafCaWnacmadHacmacyadEacZacyacyacyacyacmacmacyacyacyacyadzacZacyadHaWJasIasJasKatxatyasNasOasIaXwaXlaXyalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWahWahWahWaRbaRbaXCaRbaRbaXRaRbaRbaRbaRbalvalvalvalvalvalvaoJatHaYaaXYaYcaYbaYgaYgaoJafCafCagbafCafCaYsafCafCagdageageaggaYtaghacmadHacmacyadMacCacyacyacTacyacmacmacyacTacyacyadMacCacyadHaFzasIasJasKatxatyasNasOasIaYWalAalAalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWahWahWahWaRbaRbaaUaRbaRbaXRaRbaRbaRbaRbalvalvalvalvalvalvaoJatHaYaaXYaYcaYbaYgaYgaoJafCafCagbafCafCaYsafCafCagdageageaggaYtaghacmadHacmacyadMacCacyacyacTacyacmacmacyacTacyacyadMacCacyadHaFzasIasJasKatxatyasNasOasIaYWalAalAalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbbYfbYhbYgaRbaRbaRbbYibYjbYjbYlbYkbYmbYlbYlagEagRagQagTaZqagVagUagWagWagYagXagYagZahbahaaZPahcahGahFahHacpacrahIacpacpbayahJacyacyacyacyacyacyacyacmacmacyacyacyacyacyacyacyacWbaIasIasIasIauobaQasIasIasIbaTaurausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbbYJbaVbYKaRbbYNbYPbYjbYjbYjbYlbYRbblbbdbbqbbnbbwbbrbbrbbzaCeacpacpacpacpacpahHaimacpacpbbEacpaipaioaiqacpacpairacpacpacpaisahHacpacpaCxacmbbTacpacpacpacpacpacpacpacpacpbcfbcjbchbclbckbcxauZavaavbavcasIbcObcKausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbaRbaRbaRbaRbbYPbYPbYjbYjbYjbYjbYjbYjbZkbZmagEajKbdibdqbdnbdubdrbdFbdxbdKbdHbdSbdLbdWbdTbdZbdTbeebedbehbegbegbeibegbegbegbedbekbejbepbembevberbeBbezbezbeEbeHbeFbeKaqgaqxaqwaqzbeSbeYavZavZawaawbbffavcasIbaTbfkausaacaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbaaYabqabBaRbbYNbYPbYjbYjbYjbYlbYRbblbbdbbqbbnbbwbbrbbrbbzaCeacpacpacpacpacpahHaimacpacpbbEacpaipaioaiqacpacpairacpacpacpaisahHacpacpaCxacmbbTacpacpacpacpacpacpacpacpacpbcfbcjbchbclbckbcxauZavaavbavcasIbcObcKausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbaRbaRbaRbaRbbYPbYPbYjbYjbYjbYjbYjbYjbZkbZmagEajKbdibdqbdnbdubdrbdFbdxbdKbdHbdSbdLbdWbdTbdZbdTbeebedbehbegbegbeibegbegbegbedbekbejbepbembevberbeBbezbezbeEbeHbeFbeKaqgaqxaqwaqzbeSbeYavZaciawaawbbffavcasIbaTbfkausaacaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbYPbZvbZvbZvbZvbZvbYPbYjbYjbYjbYjbYjbZzbYlbfFawsawpbfGbfJawsawsawsawtawtawtawuarebfQarfaaTaaTaaTawyawzawzawzawzawzawzawzawzawzawAbfWawCbfYawEawFawGawGawGawGawHawIawJawKawKargasdbgfasIasIasIasIasIasIasIasIbcObgrausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbYPbZvbZvbZvbZvbZvbYjbYjbZFbZDbZmbYjbYjbYlbYjawsawPbgGbgJbgHbgNawsawUbgObrvawubhcbhaawZawubhgaxbawyaxcaxcaxcaxcaxcaxcaxcaxcaxdawEaxeaxfaxgawEbhrbhtaxjaxjaxjbmMawIaxkaxlawKaseadHbhHbhKbhJbhJbhLbidbhLbhJbhJbiraxtausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbYPbZvbZvbZHbZJbZvcahbYjbZDbZDbZmbYlbZKbYjbYjawsaxuaxvaxwaxxbiCawsaxzbiEbiKawuaxCbhaawZawuaxDaxEawyaxcaxdaxcaxcaxcaxcaxcaxcaxcawElxQbjtbjoawEbjubjCbjzbjzbjzbjPawIaxkaxMawKbjSaCebjXausausausausausausausausausausausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/tether_yw/tether-06-station2_yw.dmm b/maps/tether_yw/tether-06-station2_yw.dmm index 7c43270019..be418634a4 100644 --- a/maps/tether_yw/tether-06-station2_yw.dmm +++ b/maps/tether_yw/tether-06-station2_yw.dmm @@ -150,7 +150,7 @@ "cT" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "cU" = (/turf/simulated/wall,/area/security/recstorage) "cV" = (/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/dark,/area/security/recstorage) -"cW" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum}) +"cW" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/telecomms/relay/preset/tether/station_low,/turf/simulated/floor/bluegrid,/area/ai_upload) "cX" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/security/brig/visitation) "cY" = (/turf/simulated/wall,/area/chapel/office) "cZ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/cable/pink{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) @@ -166,12 +166,12 @@ "dj" = (/turf/simulated/wall,/area/security/brig/visitation) "dk" = (/obj/effect/floor_decal/borderfloor/shifted{icon_state = "borderfloor_shifted"; dir = 4},/obj/effect/floor_decal/corner/red/border/shifted{icon_state = "bordercolor_shifted"; dir = 4},/obj/effect/floor_decal/corner/red{icon_state = "corner_white"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/security/brig/visitation) "dl" = (/obj/effect/floor_decal/corner/red{icon_state = "corner_white"; dir = 9},/obj/effect/floor_decal/corner/red{icon_state = "corner_white"; dir = 6},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; opacity = 0},/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor/westleft{req_access = list(1,2)},/obj/machinery/door/window/brigdoor/eastright,/turf/simulated/floor/tiled,/area/security/brig/visitation) -"dm" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum}) +"dm" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/alarm{pixel_y = 22},/obj/machinery/telecomms/relay/preset/tether/station_mid,/turf/simulated/floor/bluegrid,/area/ai_upload) "dn" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/security/brig) "do" = (/obj/effect/floor_decal/borderfloor/shifted{icon_state = "borderfloor_shifted"; dir = 8},/obj/effect/floor_decal/corner/red/border/shifted{icon_state = "bordercolor_shifted"; dir = 8},/obj/effect/floor_decal/corner/red{icon_state = "corner_white"; dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled,/area/security/brig/visitation) "dp" = (/obj/machinery/vending/hydronutrients,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/brig) "dq" = (/obj/effect/floor_decal/borderfloor/shifted{icon_state = "borderfloor_shifted"; dir = 1},/obj/effect/floor_decal/corner/lightorange/border/shifted{icon_state = "bordercolor_shifted"; dir = 1},/obj/effect/floor_decal/corner/lightorange{icon_state = "corner_white"; dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/closet/secure_closet/brig{id = "Cell 3"},/turf/simulated/floor/tiled/dark,/area/security/brig) -"dr" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum}) +"dr" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/telecomms/relay/preset/tether/station_high,/turf/simulated/floor/bluegrid,/area/ai_upload) "ds" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 5},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "dt" = (/obj/effect/floor_decal/borderfloor/shifted{icon_state = "borderfloor_shifted"; dir = 8},/obj/effect/floor_decal/corner/red/border/shifted{icon_state = "bordercolor_shifted"; dir = 8},/obj/effect/floor_decal/corner/red{icon_state = "corner_white"; dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/security/brig/visitation) "du" = (/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/borderfloorblack/corner2{icon_state = "borderfloorcorner2_black"; dir = 10},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/closet,/obj/item/weapon/material/minihoe,/turf/simulated/floor/tiled/dark,/area/security/recstorage) @@ -198,9 +198,12 @@ "dP" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1442; icon_state = "map_injector"; id = "riot_inject"},/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel_dirty,/area/security/brig) "dQ" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/green,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled,/area/security/brig) "dR" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; opacity = 0},/obj/machinery/door/airlock/maintenance/sec{name = "Riot Control"; req_access = list(1)},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/green,/turf/simulated/floor,/area/security/riot_control) +"dS" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum}) "dT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "dU" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/security{name = "Brig Recreation Storage"},/turf/simulated/floor/tiled,/area/security/recstorage) "dV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/dark,/area/security/recstorage) +"dW" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum}) +"dX" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station{base_turf = /turf/simulated/mineral/floor/vacuum}) "dY" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/lino,/area/chapel/office) "dZ" = (/obj/structure/bed/chair,/obj/effect/landmark/start{name = "Chaplain"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/lino,/area/chapel/office) "ea" = (/obj/structure/cable/pink{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/lino,/area/chapel/office) @@ -208,9 +211,7 @@ "ec" = (/obj/structure/table/woodentable,/obj/item/weapon/nullrod,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/lino,/area/chapel/office) "ed" = (/obj/structure/closet,/obj/random/contraband,/obj/random/maintenance/cargo,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/chapel/chapel_morgue) "ee" = (/obj/effect/floor_decal/techfloor{dir = 9},/turf/simulated/floor/bluegrid,/area/ai_upload) -"ef" = (/obj/effect/floor_decal/techfloor{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) "eg" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/bluegrid,/area/ai_upload) -"eh" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/bluegrid,/area/ai_upload) "ei" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/bluegrid,/area/ai_upload) "ej" = (/obj/effect/floor_decal/techfloor{dir = 5},/turf/simulated/floor/bluegrid,/area/ai_upload) "ek" = (/obj/structure/cable/pink,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -28},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) @@ -1793,7 +1794,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabacatNZWJatKUXcFeatbfkk aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacatZrSTatatatatatbfkkJlckafXXdkdldocpalcrFwbbbcUEQvLdcKccdqbqaXczcAcAcAcAcARSXMciatFrXjXjXIcYbgbgbgbgbgbgbgbgbgbgbgbgcEcFcGcHcIaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacatZrIXJObfbfRSLoRSkkJpcJafPMapcXdtBVaSLxcNbtbucPbKVFcOcQcRcScTQHcUDscVascAaNXMatcYcYcYcYcYcYcZdadadadbdcdadadddadadedfdgbgbgbgaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacacatTmYdatatatatatatkkPWdhafandjafafafaSbIbRcgbGDFdpaSaSaSaSaSbJdscUdudvazcAaNbeatdydzdAdBdCcYdDbgbgdEdEdEdEdEdEdEdEdEdFdGdHdIdJaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatRWSTataPacacacacbWWSGoafEZdLbiXRbNbOHxdNbvbwdPJcLdcKccdwbqaYdTdUQDdVaIcAXMUfatdYdZeaebeccYdDbgeddEeeefegeheiefejdEekeldHemdJaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatRWSTataPacacacacbWWSGoafEZdLbiXRbNbOHxdNbvbwdPJcLdcKccdwbqaYdTdUQDdVaIcAXMUfatdYdZeaebeccYdDbgeddEeecWegdmeidrejdEekeldHemdJaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatRWSTatkIaPacaPaPbWdKZyafIxTkeoUTepbPVUeqbBbDesbKZRcOcQcRewKQVmcUaMaRKvcAQuatateyezeAeBeCcYdDbgeDdEeEeFeGeHeIeJeKdEbUbUeLemdJaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeMeMeMeMatSJSTataPaPacaPaPbWenDGafDqBVaVBVBVaSeSeQbEbFcPcdaSaSaSaSaSbQfcfdfdfdfdfdfiYUateBfjfkflfmcYfnfofodEfpfqfrfsftfufvdEbgbgbgbgbgaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeMaaaaeMatZrLfataPaPaPaPkIbWdKfxafdxdMdjfBfBaSfDdndQZHEmceLdcKccdObqbdfIfdMpfKfLfdXMfNatfOfOfPfQfOcYfRfSfTdEeEfUfVfWfVfUeKdEOQUXUXUXOJaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -1839,11 +1840,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababab aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababababababaPaPaPaPaPacacacacacacacacAUAUAUAUAUAUAGAVAWAXAYAXAZBaBbAGBcAKBdBdANBeAiaczaAPBfBgBhBiaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaacacacacacacacacAUBjBkBlAUBmAGBnBoBpBpBpBqBrBsAGBcBtBuBvBwBeAiaczaBxByzaAFaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaacacacAUBzBABBAUBCAGBDBEBFBGBGBHBIBJAGBKBKBKyYyYyYyYyYyYBLBLyYyYyYyYyYaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaacacacAUAUBMAUAUBNAGBOBPBQBRBSBTBIBUAGacacacyYcWBWBWBWBWBXBXBYBWBWBWBZaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaacacacAUCaCbCcCdCeCfCgChCiCjCkClBICmAGacacacyYdmCoCpCqCrCsCtCuCvCwCxBWaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaCyCzCzCACBCCAGCDAXCECFCGCHCICJAGacacacyYdmCoCKCtCtCtCtCtCtCtCLCMaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaCNCOCOAUAUAUAGCPAXCQCRCSCTCUCVAGacacacyYdmCoCWCXCYCZDaDbDcDcCxBWaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaaaaaaaaPaPaPacacacAGDdAXAXDeDfAXCUDgAGacacacyYdrBWBWBWBWBWBWBYBWBWBWBZaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaacacacAUAUBMAUAUBNAGBOBPBQBRBSBTBIBUAGacacacyYdSBWBWBWBWBXBXBYBWBWBWBZaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaacacacAUCaCbCcCdCeCfCgChCiCjCkClBICmAGacacacyYdWCoCpCqCrCsCtCuCvCwCxBWaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaCyCzCzCACBCCAGCDAXCECFCGCHCICJAGacacacyYdWCoCKCtCtCtCtCtCtCtCLCMaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaCNCOCOAUAUAUAGCPAXCQCRCSCTCUCVAGacacacyYdWCoCWCXCYCZDaDbDcDcCxBWaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaaaaaaaaPaPaPacacacAGDdAXAXDeDfAXCUDgAGacacacyYdXBWBWBWBWBWBWBYBWBWBWBZaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaaaaaaaaPaPaPaPacacAGDiDiDiAGAGDiDiDiAGacacacyYyYyYyYyYyYyYyYyYyYyYyYyYaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPacacacacacacacacacacacacacaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPaPacacacacacacacacacacacacacacacacaPaPaPaPaPaPaPaPaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/tether_yw/tether-07-station3_yw.dmm b/maps/tether_yw/tether-07-station3_yw.dmm index fd29b1de32..f197ef4611 100644 --- a/maps/tether_yw/tether-07-station3_yw.dmm +++ b/maps/tether_yw/tether-07-station3_yw.dmm @@ -220,10 +220,10 @@ "el" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "em" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/maintenance/station/ai) "en" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/red_hos,/obj/item/weapon/pen/multi,/obj/item/device/radio/intercom/department/security{dir = 4; icon_state = "secintercom"; pixel_x = 24; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/heads/hos) -"eo" = (/obj/machinery/light_switch{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) +"eo" = (/obj/machinery/access_button/airlock_interior{frequency = 1333; pixel_x = 25},/turf/simulated/floor,/area/maintenance/station/ai) "ep" = (/turf/simulated/wall,/area/security/security_lockerroom) "eq" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled/dark,/area/security/security_lockerroom) -"er" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1379; icon_state = "map_vent"; id_tag = "eva_port_maint_pump"},/obj/random/junk,/turf/simulated/floor,/area/maintenance/station/ai) +"er" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1333; id_tag = "cargo_lock_pump"},/obj/random/junk,/turf/simulated/floor,/area/maintenance/station/ai) "es" = (/obj/effect/decal/cleanable/dirt,/obj/structure/railing{dir = 8},/obj/structure/railing,/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/cargo) "et" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/security/breakroom) "eu" = (/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable/green{icon_state = "0-4"},/obj/structure/closet/secure_closet/security,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/dark,/area/security/security_lockerroom) @@ -402,6 +402,7 @@ "hL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/security/eva) "hM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/eva) "hN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/tiled,/area/security/eva) +"hO" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 5},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/camera/network/security{icon_state = "camera"; dir = 8},/obj/effect/decal/cleanable/cobweb{icon_state = "cobweb2"},/turf/simulated/floor/tiled/dark,/area/lawoffice) "hP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/security/eva) "hQ" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/security/eva) "hR" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor,/area/maintenance/station/ai) @@ -500,6 +501,7 @@ "jG" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/security{name = "Armory Storage"; secured_wires = 1},/obj/machinery/door/blast/regular{dir = 1; id = "armoryblue"; name = "Blue Armory"},/turf/simulated/floor/tiled/dark,/area/security/armory/blue) "jH" = (/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/corner/blue/border{dir = 8},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/button/remote/blast_door{id = "armoryblue"; name = "Blue Armory Access"; pixel_x = -24; pixel_y = 24; req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/armory/blue) "jI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/hallwayaux) +"jJ" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1333; id_tag = "cargo_lock_pump"},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/maintenance/station/ai) "jK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/hallway) "jL" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock/glass_security{name = "Brig Observation"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/observation) "jM" = (/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) @@ -522,6 +524,7 @@ "kd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/security/armory/blue) "ke" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/corner_techfloor_grid{dir = 5},/obj/effect/floor_decal/techfloor,/turf/simulated/floor/tiled/dark,/area/security/armory/blue) "kf" = (/obj/structure/sign/warning/secure_area,/turf/simulated/wall/r_wall,/area/security/armory/blue) +"kg" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) "kh" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light_switch{dir = 4; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "ki" = (/obj/structure/closet/crate,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/station/ai) "kj" = (/obj/structure/railing,/turf/simulated/floor,/area/maintenance/station/ai) @@ -560,11 +563,11 @@ "kQ" = (/obj/structure/catwalk,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/maintenance/station/ai) "kR" = (/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/turf/simulated/floor,/area/maintenance/station/ai) "kS" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/turf/simulated/floor,/area/maintenance/station/ai) -"kT" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1379; id_tag = "eva_port_maint_pump"},/obj/random/junk,/turf/simulated/floor,/area/maintenance/station/ai) -"kU" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1379; id_tag = "eva_port_maint_pump"},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/maintenance/station/ai) +"kT" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/external{frequency = 1333; id_tag = "cargo_lock_inner"; locked = 1},/turf/simulated/floor,/area/maintenance/station/ai) +"kU" = (/obj/machinery/door/airlock/external{frequency = 1333; id_tag = "cargo_lock_outer"; locked = 1},/turf/simulated/floor,/area/maintenance/station/ai) "kV" = (/obj/machinery/recharge_station,/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) "kW" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) -"kX" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) +"kX" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) "kY" = (/obj/effect/floor_decal/borderfloorblack{dir = 10},/obj/effect/floor_decal/borderfloorblack/corner2{dir = 9},/obj/structure/table/steel,/obj/item/weapon/cell/device/weapon{pixel_x = -3},/obj/item/weapon/cell/device/weapon{pixel_x = 3},/turf/simulated/floor/tiled/dark,/area/security/security_equiptment_storage) "kZ" = (/turf/simulated/floor/tiled/dark,/area/security/security_equiptment_storage) "la" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack/corner2,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/glasses/hud/security,/obj/item/clothing/glasses/hud/security,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled/dark,/area/security/security_equiptment_storage) @@ -583,13 +586,13 @@ "ln" = (/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/bluegrid,/area/ai/foyer) "lo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk,/turf/simulated/floor,/area/maintenance/station/ai) "lp" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{icon_state = "map"; dir = 8},/turf/simulated/floor,/area/maintenance/station/ai) -"lq" = (/obj/machinery/door/airlock/external{locked = 1},/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/maintenance/station/ai) +"lq" = (/obj/machinery/door/airlock/external{frequency = 1333; id_tag = "cargo_lock_inner"; locked = 1},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/maintenance/station/ai) "lr" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,/turf/simulated/floor,/area/maintenance/station/ai) "ls" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor,/area/maintenance/station/ai) -"lt" = (/obj/machinery/door/airlock/external{locked = 1},/turf/simulated/floor,/area/maintenance/station/ai) +"lt" = (/obj/machinery/door/airlock/external{frequency = 1333; id_tag = "cargo_lock_outer"; locked = 1},/obj/machinery/access_button/airlock_exterior{frequency = 1333; pixel_y = -25},/turf/simulated/floor,/area/maintenance/station/ai) "lu" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/undies_wardrobe,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) "lv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/security/security_bathroom) -"lw" = (/obj/machinery/light{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) +"lw" = (/obj/machinery/light_switch{dir = 1; pixel_y = -24},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) "lx" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = newlist()},/turf/simulated/floor/tiled/dark,/area/security/security_equiptment_storage) "ly" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = newlist()},/turf/simulated/floor/tiled/dark,/area/security/security_equiptment_storage) "lz" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/hallway) @@ -615,7 +618,7 @@ "lT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/maintenance/station/ai) "lU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/maintenance/station/ai) "lV" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4},/turf/simulated/floor,/area/maintenance/station/ai) -"lW" = (/obj/machinery/door/airlock/external{locked = 1},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/maintenance/station/ai) +"lW" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1333; icon_state = "map_vent"; id_tag = "cargo_lock_pump"},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1333; id_tag = "cargo_lock"; pixel_y = -25; tag_airpump = "cargo_lock_pump"; tag_chamber_sensor = "cargo_lock_sensor"; tag_exterior_door = "cargo_lock_outer"; tag_interior_door = "cargo_lock_inner"},/turf/simulated/floor,/area/maintenance/station/ai) "lX" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{icon_state = "map"; dir = 1},/turf/simulated/floor,/area/maintenance/station/ai) "lY" = (/turf/space,/area/shuttle/antag_space/north) "lZ" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/turf/simulated/floor/tiled/white,/area/security/security_bathroom) @@ -641,7 +644,7 @@ "mt" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/bluegrid,/area/ai/foyer) "mu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/catwalk,/turf/simulated/floor,/area/maintenance/station/ai) "mv" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/structure/closet/emcloset,/turf/simulated/floor,/area/maintenance/station/ai) -"mw" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1379; icon_state = "map_vent"; id_tag = "eva_port_maint_pump"},/turf/simulated/floor,/area/maintenance/station/ai) +"mw" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1379; icon_state = "map_vent"; id_tag = "eva_port_maint_pump"},/obj/random/junk,/obj/machinery/airlock_sensor{frequency = 1333; id_tag = "cargo_lock_sensor"; pixel_y = -25},/turf/simulated/floor,/area/maintenance/station/ai) "mx" = (/obj/effect/floor_decal/borderfloorblack{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/item/device/radio/intercom{dir = 8; pixel_x = -24},/obj/structure/table/steel,/obj/item/weapon/storage/box/nifsofts_security,/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled/dark,/area/security/security_lockerroom) "my" = (/obj/structure/sign/warning/secure_area,/turf/simulated/wall/r_wall,/area/security/security_bathroom) "mz" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/tiled,/area/security/security_processing) @@ -653,6 +656,8 @@ "mF" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled,/area/security/hallway) "mG" = (/obj/structure/railing{dir = 8},/obj/machinery/camera/network/security{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/open,/area/security/hallway) "mH" = (/turf/simulated/wall/r_wall,/area/security/hallway) +"mI" = (/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/hallway/station/upper) +"mJ" = (/obj/effect/floor_decal/techfloor/orange{dir = 6},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/obj/structure/closet/walllocker/emerglocker/east,/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing) "mK" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/security/hallway) "mL" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/hallway) "mM" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/briefing_room) @@ -999,7 +1004,6 @@ "tp" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/hallway/station/upper) "tq" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/lightgrey/border{dir = 5},/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/obj/structure/flora/pottedplant/stoutbush,/turf/simulated/floor/tiled,/area/hallway/station/upper) "tr" = (/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/light{dir = 1},/obj/machinery/vending/cola,/turf/simulated/floor/tiled,/area/hallway/station/upper) -"ts" = (/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/vending/snack,/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1379; id_tag = "sec_fore_airlock"; pixel_x = 24; pixel_y = 0; req_one_access = list(13); tag_airpump = "sec_fore_pump"; tag_chamber_sensor = "sec_fore_sensor"; tag_exterior_door = "sec_fore_outer"; tag_interior_door = "sec_fore_inner"},/turf/simulated/floor/tiled,/area/hallway/station/upper) "tt" = (/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor,/area/maintenance/cargo) "tu" = (/obj/machinery/conveyor{dir = 1; id = "packageSort1"},/obj/machinery/light{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/delivery) "tv" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/delivery) @@ -1113,7 +1117,6 @@ "vA" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/papershredder,/turf/simulated/floor/tiled/dark,/area/lawoffice) "vB" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/dark,/area/lawoffice) "vC" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/tiled/dark,/area/lawoffice) -"vD" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 5},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/camera/network/security{icon_state = "camera"; dir = 8},/turf/simulated/floor/tiled/dark,/area/lawoffice) "vE" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 1},/obj/machinery/recharge_station,/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/turf/simulated/floor/tiled,/area/security/lobby) "vF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/lobby) "vG" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 5},/obj/machinery/computer/security,/turf/simulated/floor/tiled,/area/security/lobby) @@ -1663,7 +1666,6 @@ "Gg" = (/obj/effect/floor_decal/techfloor/orange,/obj/effect/floor_decal/techfloor/hole,/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing) "Gh" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing) "Gi" = (/obj/effect/floor_decal/techfloor/orange,/obj/effect/floor_decal/techfloor/hole/right,/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing) -"Gj" = (/obj/effect/floor_decal/techfloor/orange{dir = 6},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled/techfloor,/area/teleporter/departing) "Gk" = (/turf/simulated/open,/area/tether/station/stairs_three) "Gl" = (/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 16},/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable/green{icon_state = "0-4"},/turf/simulated/floor/tiled/white,/area/medical/reception) "Gm" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/reception) @@ -2237,7 +2239,6 @@ "Rj" = (/obj/structure/railing,/obj/structure/railing{dir = 8},/turf/space,/area/space) "Rk" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/maintenance/station/sec_upper) "Rl" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/red/border{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 6},/obj/machinery/suit_cycler/security,/obj/machinery/meter,/turf/simulated/floor/tiled,/area/security/eva) -"Rm" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/wall/r_wall,/area/security/lobby) "RB" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/warden) "Sa" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/tiled,/area/security/eva) "SW" = (/turf/simulated/mineral/vacuum,/area/space) @@ -2297,10 +2298,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababaoaojujujabdjSjT aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababaoaojujukckerAaokfeAeBeCcRcPcPeDcUjkjkjkjkjkjkcWcMcYjekhjMdaeEdseFjeaIeIaIababababababiVeNiVbYbYdieOePeQePeRdmbYbYkigKkjkkibgyklkmdckngyababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababaoaoaokokokokokokoeTeTeVeicPQVkNeDjkjkjkjkjkjkcfkqkrcqksktkukveYjejefbfcaIaIaIababababiVdTiVabbYcKfgfhfifjdjcKbYgJgKcyibibibgykwkxbpkygyabababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababdSdSdSdSdSkodgkzkAfkkBkCeTipjKjLkDkEeDjkjkjkjkjkjkctcMkrdqdukFkGkHkIjedbfqfcdAdAaIababababiVfxiVabbYbYbYbYfybYbYbYbYgJgKcyibgygygygydvgygygygygygyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdSdSdSkJkJkJkJeTkKkLdzfzfAfBfCfDQWeDkOwReDjkjkjkjkjkjkctcMkPjejejejejejejeaffGdwdwQXaIababababiVdTiVabfPfQfRfSfTfRfUfVfPgJgKcykQgybpkRgKkSgKgykTkUgygyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdSkVaneLeLkWkXeTkYkZlafWfXfYeTgalbcPcPeDcUgbjkjkjkjkgbcflcldledOlflglhlieZleleaffcljaIabababiViVdTiVabfPlklllllmlllllnfPgJgKcylogygKgKbplpgKlqlrlsltgyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadSdPdPludQlvlweTeTlxeTeTlyeTeTlzlAlBlClClDcTcVjkjkcScTlDlElFeXlGlHlHlHlHlIlJlKaffclLaIabababiVlMlNiVabfPlOlllPlQlPlllRfPgJegcylSemlTlUgKgKlVlWlXlsltgyaaaaaalYlYlYlYlYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadSlZaneLmambeoepmceqmdmemfmgmhmimjlBlClClDcTcVjkjkcScTlDlEmkaqmlmmmnlHmmmnmompafeIaIaIiViViViVmqdTiVabfPlkmrllmsllmtlnfPgJgKcymugybpgKgKgKmvgymwergygyaaaaaalYlYlYlYlYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdSdSdSkJkJkJkJeTkKkLdzfzfAfBfCfDQWeDkOwReDjkjkjkjkjkjkctcMkPjejejejejejejeaffGdwdwQXaIababababiVdTiVabfPfQfRfSfTfRfUfVfPgJgKcykQgybpkRgKkSeogyerjJgygyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdSkVaneLeLkWkgeTkYkZlafWfXfYeTgalbcPcPeDcUgbjkjkjkjkgbcflcldledOlflglhlieZleleaffcljaIabababiViVdTiVabfPlklllllmlllllnfPgJgKcylogygKgKbplpgKkTlrlskUgyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadSdPdPludQlvkXeTeTlxeTeTlyeTeTlzlAlBlClClDcTcVjkjkcScTlDlElFeXlGlHlHlHlHlIlJlKaffclLaIabababiVlMlNiVabfPlOlllPlQlPlllRfPgJegcylSemlTlUgKgKlVlqlXlsltgyaaaaaalYlYlYlYlYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadSlZaneLmamblwepmceqmdmemfmgmhmimjlBlClClDcTcVjkjkcScTlDlEmkaqmlmmmnlHmmmnmompafeIaIaIiViViViVmqdTiVabfPlkmrllmsllmtlnfPgJgKcymugybpgKgKgKmvgylWmwgygyaaaaaalYlYlYlYlYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaeaeaemydPdPdPdPardPepmxmAmBmBmCmDmhmEmFmGlClCmHjyjkjkjkjkjymHmKmLeXmMmmmNlHmOmNmPmQaffcmRmRmSmTesmUmVdTiVabfPmWmXmYmZnanbncfPgJjDcyndgygygygygygygygygygyaaaaaaaalYlYlYlYlYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaadRnenfngnhetniepeunjnkevmfnlepnmnnnolClClDjkjkjkjkjkjklDnpnqeXnrnsntjhnsntnvnwaffcQYQZiVnxmTmTmTdTiVabfPfPfPfPfPfPfPfPfPgJgJnynznAnBnCgyababababababaaaaaaaalYlYlYlYlYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaanDeynEnFeyetnGepnHnInJnKnLnMmhlznNasnOnOlDjkjkjkjkjkjklDnPnQeXnRmOnSlHmmnSnTnUafdwRaaIiViViViViVdTiVabababababgJhyhyhyhygJnVgKbVbVbVlogygygygygygygyaaaaaaaalYlYlYlYlYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -2312,13 +2313,13 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaeqcqcqdqdqdqdqdqdqdqeqefHfH aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeqvqwqxqyfJqzqAqBqCqDqEqFqGqHqIqeqJlAozqKqLqMoAfKqNqNqOmzqQqRqSmHmHmHmHmHqTReqVfcaIaIaIaIababababiVqWiVqXiVqrqYqrqZraqrqrqrquququququququrbrcququababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaerdrerfrgrhrirjrkrlrmrmrnrorprmrqrrrsozrtfLruoArvrwrxpOryqQlErzrBterCrDrDrEfcfcmRaIabababababababiVrFrGrHrIqrrJqrrKrLrMrNrOrPrQrRrSrTrUrVrWrXrYrZquabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeqcsasbscwSsdsesfqdsgshsisjskslfHsmlAozozfNozoAqQqQqQsnqQoAaKaLmHmHsoafafafafafafafspsqsqsqsqsqsqiVsrssstsuqrrJsvswsxsyszsAsBsCsDsEsFsGsHsIsJrXsKquabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaesLfOsMsNsOsPsMsQqCsRsSsTsTsUsRqesVDOsXsYsZtatbqPpgtdtftZtgthtitjmHtktltmtntntntntntntotptqtrfZtssqsqiVttiVqrtutvswtwtxtyqrququtztAqutBtCtDtEsJtFquabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaesLfOsMsNsOsPsMsQqCsRsSsTsTsUsRqesVDOsXsYsZtatbqPpgtdtftZtgthtitjmHtktltmtntntntntntntotptqtrfZmIsqsqiVttiVqrtutvswtwtxtyqrququtztAqutBtCtDtEsJtFquabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaetGtHtIgctJtKtLtMqCtNtOtPtQtRtNqetStTtUtVtWpGtTtXtYpGtWuaubucuduemHufuguhtnuiuiuiuitnujukulumumumunsquoupuqqrurusswutuuuvuwuxuyuzuAaFrZuCuDsJsJuEquabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeuFuGuHuIqcuGuHuIqcuJuJuJuJuJuJuJuKuLuMuNuOuPuQuRuSmHuTuUuVaMaNmHmHuWtluXtnuiuiuiuiuiuYukuluZumvavasqvbvcvdqrveqrvfvgvhviuwvjvkvlvkvmvnvovpvqvqvrquabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaavsvsvsvsvtvtvtvtvtvtvuvvvwvxvyvzvAvBvCvDuPvEvFvGuPvHvIvJvKvLuPvMvNtlvOtnuiuiuiuiuiuYukuluZumvPvQsqvRvSvTqrvUqrvVvWvXvYuwvjvkvlvkvZwahsuDwcsJwdquababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaavsvsvsvsvtvtvtvtvtvtvuvvvwvxvyvzvAvBvChOuPvEvFvGuPvHvIvJvKvLuPvMvNtlvOtnuiuiuiuiuiuYukuluZumvPvQsqvRvSvTqrvUqrvVvWvXvYuwvjvkvlvkvZwahsuDwcsJwdquababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaeaeaeaevsvtvtvtwevtvtvttcwgwhwhwhwhwhwhwhwiuPwjwkwlwmwnwowpwpwquPwrwswtwutnuiuiuiuiwvwwukulwxumwywysqwzsqsqqrwAwBwCwDwEwDqrwFwGwHwIvZwawJuDsJsJwKquabababvtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaaaaavswLvtvtvtvtvtvttcwgwhwMwhCuwhwMwhwNuPwOwPwQsWRfwTwUwnwVuPwWuWtlwXtntntntntntnwYwZxaxbxbxbxbxcxdxexfxgxhxixjxkxlxmxmxnvkvlvkxoxpxqxrxssJxtquabababvtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaxuxvxwxwxwxwxvxxwevttcxyxzxAxBxCxDxExFxGRmxHxIVnxJwnxKxLxLxMuPxNxOtlspspspspspspspxPxQxRxRxRxRxRxSxTxUxVxRxRxWxXxYxZyayaybyaxZyaycydyeyfygygyhquababvtvtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaxuxvxwxwxwxwxvxxwevttcxyxzxAxBxCxDxExFxGuPxHxIVnxJwnxKxLxLxMuPxNxOtlspspspspspspspxPxQxRxRxRxRxRxSxTxUxVxRxRxWxXxYxZyayaybyaxZyaycydyeyfygygyhquababvtvtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaxvxwxwxwxwxwxwxwvtvtvuyiyjykylymynykyoypuPyqyrysuPytyuyvywyxuPyyuWyzyAyByCyDyEyFsqyGyHyIyJyJyKyLyMyNyOyPyQyQyQyQyRySySyTyUyVyWyXyYquyZzazbzczdquabvtvtvtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaeaexwxwzezfzgzhzizjzkzluOwfwfwfuOzmuOwfwfwfuPznzozpuPzqzqzqzrzsztyzzuyzzvzwzwzxzyzzsqzAzBzCzDzDzDzDzDzDzDzEzFzGzHzIzJzKzKzLzMzKzNzOzOquzPzQquzRzRquzOvtvtvtaeaeaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaxwxwzSzTzTzTzUxwzVzWzXzYzZAaAbAcAdAeAfAaAgAeAeAeAhAeAiAjAkAlAmAnAoApAqArxbAsAsAtAuAvAyAzAAABACADAEAFzDAGAHAHAHAHzLAIAJAKALAMANAOAPAQARASATAUAVAWAXvtvtAYAYAYAYAYAYAYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -2328,7 +2329,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaeaexwxwCTCUCVCWCXzjCYCZspDa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaxvxwxwxwxwxwxwxwvtvtweDaDEDFDGDHDIDJDfDKDLDfDMDNEIEJDQDRDSDTDUDpDVDWDXDWDYDpDZEaEbAAEcEdEeEfEgEhEiEjzDEkElElEmEnEozLEpEqErEszKEtBUEuEvEwBUEuExEyEzBUEzCSCSAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaxuxvxwxwxwxwxvxxvtvtvtDaEAEBECECECEDDfEEEFDfEGEHGnGoEKELEMENEOEPEQERESERETDpEUEVEWEXEYEZEZEZFaFbFcEfFdFeFfFgFhFiFjzLzLzLzKzKzLFkBUEuFlEwBUEuBUFmCPCPFnCSCSAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaaaaavtvtvtvtwevtvtvtabDaFoFpFqFrFqFsDfFtFuDfFvFwFxFyFzFAFBFCFDFEFFFGFHFIFJDpFKFLFMAAFNEfFOFPFQFRFSFTzDFeAHFUFVFWFXFYFZGaGbGcFjGdBUEuEvEwBUEuCNGeEzBUEzCSCSAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaeaeaeaevtvtwevtvtababababDaDaGfGgGhGiGjDfGkGkDfGlGmGSHIGpGqGrGsGtGuGvGwGxGyGzDpDrGAGBzDzDzDzDzDzDzDzDzDzDFeGCGCGDGEFjGFGGGHGIGJFjGKGLGMGNEwBUEuGOGPGQGRGQCSCSAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaeaeaeaeaevtvtwevtvtababababDaDaGfGgGhGimJDfGkGkDfGlGmGSHIGpGqGrGsGtGuGvGwGxGyGzDpDrGAGBzDzDzDzDzDzDzDzDzDzDFeGCGCGDGEFjGFGGGHGIGJFjGKGLGMGNEwBUEuGOGPGQGRGQCSCSAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaaaaavtvtvtvtabababGTGTGTGTGTGTGTGTGTDfGkGkDfGUGVGWGXGYGZHaENHbEPHcFGHdHeHfHgHhHiHjHkHlHmHnHoHpHqababAHHrGCHsHtHuFjHvGGHwHxHyHzHAHBHBHCHDHEBUGOHFCPHGHHAYAYAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaeaaaaaavtvtvtababababGTHJHJHJHJHKHJHJHLDfGkGkDfHMHNHOhxHQHRHSHTHUDpHVHWHXHYHZIaIbIcIdHkIeIfIgIhIiHqababAHHrGCIjIkIlFjImGGInIoIpIqIrIsIsItBUIuIuIvHFAXaaaeAYAYAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaeadadadaaaavtabababababGTHJIwIxIxIxIxIxIxIxIxIyIyIyIyIzIyIyIyIAIBICIDIDIEIFIDIDIDIGEVIHIIIJIKILIMINHqababAHHrGCIOIPIQFjIRGIISGGITFjIUBUBUIVIWGRIXGRIYAXaaaeAYAYAYAYAYAYAYaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa