From 4aa58b020179f8374c8149ea25155f3bde42dc58 Mon Sep 17 00:00:00 2001 From: GREEG Date: Mon, 13 Nov 2023 01:29:12 +0500 Subject: [PATCH 01/14] Delta-SM-Space-Drop --- _maps/map_files220/delta/delta.dmm | 7109 ++++++++--------- modular_ss220/modular_ss220.dme | 1 + .../sm_space_drop/code/paper_sm_info.dm | 19 + modular_ss220/sm_space_drop/code/sm_button.dm | 97 + .../sm_space_drop/code/sm_mass_driver.dm | 42 + .../sm_space_drop/code/sm_space_drop.dm | 4 + .../sm_space_drop/icon/sm_buttons.dmi | Bin 0 -> 419 bytes modular_ss220/sm_space_drop/sm_space_drop.dm | 16 + modular_ss220/sm_space_drop/sm_space_drop.dme | 6 + 9 files changed, 3719 insertions(+), 3575 deletions(-) create mode 100644 modular_ss220/sm_space_drop/code/paper_sm_info.dm create mode 100644 modular_ss220/sm_space_drop/code/sm_button.dm create mode 100644 modular_ss220/sm_space_drop/code/sm_mass_driver.dm create mode 100644 modular_ss220/sm_space_drop/code/sm_space_drop.dm create mode 100644 modular_ss220/sm_space_drop/icon/sm_buttons.dmi create mode 100644 modular_ss220/sm_space_drop/sm_space_drop.dm create mode 100644 modular_ss220/sm_space_drop/sm_space_drop.dme diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index d7f4d3fb3c65..818ec8f4c0f5 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -793,20 +793,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) -"age" = ( /obj/structure/sign/vacuum{ pixel_x = -32 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) +"age" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plasteel{ + icon_state = "yellowcorner" + }, +/area/station/engineering/controlroom) "agg" = ( /obj/machinery/status_display/directional/west, /obj/machinery/light/directional/west, @@ -1129,10 +1126,26 @@ }, /area/station/hallway/secondary/entry) "aiE" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "aiF" = ( /obj/structure/chair{ dir = 8 @@ -1212,11 +1225,32 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) -"ajf" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/delivery, +"ajx" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/engineering/controlroom) "ajy" = ( /obj/item/kirbyplants, /obj/effect/turf_decal/delivery, @@ -3998,10 +4032,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "avx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson, /obj/effect/turf_decal/delivery/hollow, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "avC" = ( @@ -4011,12 +4048,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"avE" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "caution" - }, -/area/station/engineering/controlroom) "avI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4224,14 +4255,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "awP" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "caution" + icon_state = "neutralfull" }, /area/station/engineering/controlroom) "awV" = ( @@ -4525,12 +4550,22 @@ }, /area/station/hallway/secondary/entry) "axI" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Supermatter West"; + dir = 4; + network = list("Engineering","SS13"); + pixel_y = -22 + }, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/dispenser, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axJ" = ( @@ -4538,69 +4573,50 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axK" = ( -/obj/machinery/atmospherics/meter, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axL" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"axM" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, -/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axN" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"axO" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axP" = ( -/obj/structure/sign/electricshock{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "caution" - }, -/area/station/engineering/controlroom) -"axR" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "caution" + icon_state = "neutralfull" }, /area/station/engineering/controlroom) "axS" = ( @@ -4616,28 +4632,20 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axV" = ( -/obj/machinery/atmospherics/trinary/filter{ - dir = 4; - filter_type = "o2"; - on = 1 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/machinery/atmospherics/meter, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axW" = ( -/obj/item/kirbyplants, -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/atmospherics/unary/portables_connector, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/engineering/engine/supermatter) "axY" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -4791,13 +4799,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) -"ayI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ayJ" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -4809,9 +4810,6 @@ /area/station/engineering/controlroom) "ayK" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ayL" = ( @@ -4822,7 +4820,11 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "ayO" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" + }, /turf/simulated/floor/plating, /area/station/engineering/engine/supermatter) "ayP" = ( @@ -4832,20 +4834,13 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "ayR" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) -"ayT" = ( +/obj/item/wrench, /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 5 }, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/engineering/engine/supermatter) "ayV" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -5161,33 +5156,17 @@ /turf/simulated/floor/plating, /area/station/engineering/engine/supermatter) "azU" = ( -/obj/machinery/atmospherics/meter, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) -"azV" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "azW" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "azZ" = ( @@ -5221,10 +5200,15 @@ /turf/space, /area/space/nearstation) "aAg" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/radio/intercom/directional/west, +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular{ + pixel_y = 6 }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aAi" = ( /obj/structure/lattice/catwalk, @@ -5572,7 +5556,10 @@ /turf/space, /area/space/nearstation) "aBX" = ( -/obj/machinery/atmospherics/supermatter_crystal, +/obj/machinery/sm_mass_driver{ + dir = 1 + }, +/obj/machinery/atmospherics/supermatter_crystal/engine, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "aBY" = ( @@ -5584,30 +5571,50 @@ /turf/simulated/floor/plasteel, /area/station/supply/sorting) "aCd" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/effect/spawner/window/reinforced/plasma/grilled, /obj/structure/cable{ - d2 = 4; - icon_state = "0-4" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aCi" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 +/obj/machinery/atmospherics/trinary/filter{ + dir = 1; + filter_type = "n2"; + name = "nitrogen filter"; + on = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aCj" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/atmospherics/portable/scrubber, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, /area/station/engineering/controlroom) "aCk" = ( /obj/structure/sign/securearea, @@ -5755,39 +5762,6 @@ icon_state = "redfull" }, /area/station/security/brig) -"aCU" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aCV" = ( -/obj/machinery/atmospherics/meter, -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) -"aCW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aCZ" = ( /obj/machinery/door/airlock/atmos/glass{ heat_proof = 1; @@ -5804,52 +5778,26 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "aDc" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aDd" = ( -/obj/machinery/atmospherics/meter, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "aDe" = ( /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aDf" = ( -/obj/item/wrench, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 + dir = 4 }, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aDh" = ( -/obj/machinery/light/directional/east, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "aDj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance/two, @@ -5947,7 +5895,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/station/engineering/controlroom) +/area/space/nearstation) "aEa" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -5973,34 +5921,36 @@ /turf/space, /area/station/maintenance/auxsolarport) "aEd" = ( -/obj/machinery/atmospherics/trinary/filter{ - dir = 1; - filter_type = "n2"; - name = "nitrogen filter"; - on = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/station/engineering/controlroom) -"aEe" = ( -/obj/machinery/light/directional/west, -/obj/structure/cable/yellow{ +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel, +/area/station/maintenance/turbine) +"aEf" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/delivery/hollow, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aEf" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 4 }, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aEg" = ( @@ -6014,8 +5964,18 @@ }, /area/station/maintenance/fore) "aEj" = ( -/obj/machinery/atmospherics/binary/pump, -/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aEk" = ( @@ -6038,17 +5998,16 @@ dir = 8; name = "Nitrogen to Loop" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aEm" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/reflector/box{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + dir = 4; + icon_state = "yellow" }, /area/station/engineering/controlroom) "aEp" = ( @@ -6279,9 +6238,7 @@ /turf/space, /area/space) "aFd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aFe" = ( @@ -6329,29 +6286,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"aFj" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "aFl" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/portables_connector, +/obj/machinery/atmospherics/portable/scrubber, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/engineering/engine/supermatter) "aFp" = ( /obj/machinery/light/directional/west, /obj/machinery/navbeacon{ @@ -6468,18 +6408,6 @@ /obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/station/supply/storage) -"aFV" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aGa" = ( /obj/machinery/atmospherics/meter, /obj/machinery/atmospherics/pipe/manifold/visible, @@ -6495,25 +6423,36 @@ /area/station/engineering/controlroom) "aGc" = ( /obj/machinery/power/apc/directional/east, +/obj/effect/turf_decal/delivery, /obj/structure/cable{ - d2 = 8; - icon_state = "0-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "0-2" }, -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aGd" = ( -/obj/structure/table/reinforced, /obj/machinery/light/small/directional/south, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/tank/internals/plasma, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, /area/station/engineering/controlroom) "aGe" = ( /obj/structure/table/glass, @@ -6542,22 +6481,17 @@ /area/station/supply/storage) "aGi" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/structure/cable{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -6759,17 +6693,6 @@ icon_state = "neutralfull" }, /area/station/engineering/controlroom) -"aHp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aHr" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "IAA" @@ -6808,12 +6731,12 @@ /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "aHG" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/turf/space, +/area/space/nearstation) "aHI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -7060,9 +6983,6 @@ /area/station/maintenance/turbine) "aIv" = ( /obj/machinery/atmospherics/unary/tank/toxins, -/obj/structure/sign/nosmoking_2{ - pixel_y = 32 - }, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIw" = ( @@ -7079,10 +6999,12 @@ c_tag = "Turbine"; network = list("SS13","Engineering") }, -/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIy" = ( +/obj/structure/sign/nosmoking_2{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIz" = ( @@ -7093,6 +7015,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIA" = ( @@ -7106,44 +7029,31 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) -"aIB" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aID" = ( -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aIE" = ( -/obj/machinery/light/directional/south, -/obj/machinery/status_display/directional/south, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aIF" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aIG" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aIH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/delivery/hollow, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/closet/firecloset, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aIQ" = ( @@ -7318,9 +7228,20 @@ /turf/space, /area/space/nearstation) "aJD" = ( -/obj/item/kirbyplants, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/table/reinforced, +/obj/item/multitool, +/obj/item/multitool{ + pixel_x = 4; + pixel_y = -4 + }, /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -7331,30 +7252,29 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "aJF" = ( -/obj/item/kirbyplants, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aJG" = ( -/obj/structure/table/reinforced, -/obj/machinery/light/small/directional/south, -/obj/item/multitool, -/obj/item/multitool{ - pixel_x = 4; - pixel_y = -4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aJH" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -7421,26 +7341,20 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aJS" = ( -/obj/machinery/light/directional/north, -/obj/machinery/power/apc/directional/north, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) +/area/station/engineering/controlroom) "aJU" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/sign/nosmoking_2{ - pixel_y = 32 +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "aJV" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -7783,7 +7697,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aLx" = ( @@ -7965,6 +7881,11 @@ dir = 8; name = "Port to Turbine" }, +/obj/machinery/power/apc/directional/south, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aMJ" = ( @@ -7972,10 +7893,14 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/turbine) "aMK" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/space, +/area/space) "aML" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -8538,31 +8463,6 @@ icon_state = "neutralfull" }, /area/station/maintenance/turbine) -"aPy" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, -/obj/item/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/station/engineering/atmos) -"aPz" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/obj/item/radio/intercom/directional/north, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/station/engineering/atmos) "aPC" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -9856,6 +9756,36 @@ /obj/effect/spawner/window/reinforced/plasma/grilled, /turf/simulated/floor/plating, /area/station/engineering/atmos) +"aVS" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/economy/vending/wallmed/directional/south, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/machinery/economy/vending/wallmed/directional/south, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aVT" = ( /obj/machinery/atmospherics/portable/canister/air{ anchored = 1 @@ -10783,13 +10713,14 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prisonlockers) "bai" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 }, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/emitter, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 5 }, -/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "baj" = ( @@ -13578,6 +13509,17 @@ }, /turf/simulated/floor/plating, /area/station/legal/courtroom) +"bmf" = ( +/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/station/engineering/controlroom) "bmg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -13777,6 +13719,27 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"bmJ" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "bmL" = ( /obj/item/kirbyplants, /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -13962,22 +13925,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/bridge) -"bnK" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/reflector/box{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "bnM" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -21564,7 +21511,9 @@ /obj/machinery/light/directional/north, /obj/machinery/ai_status_display/north, /obj/machinery/teleport/station, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bQE" = ( @@ -21780,22 +21729,6 @@ }, /turf/space, /area/space/nearstation) -"bRr" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel/dark, -/area/station/aisat) -"bRs" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/firealarm/directional/east, -/turf/simulated/floor/plasteel/dark, -/area/station/aisat) "bRt" = ( /obj/machinery/computer/teleporter, /obj/effect/turf_decal/stripes/line{ @@ -21803,22 +21736,6 @@ }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) -"bRx" = ( -/obj/structure/showcase{ - density = 0; - dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; - pixel_x = -9; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plating, -/area/station/turret_protected/aisat) "bRz" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -22097,7 +22014,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bSy" = ( @@ -22253,7 +22172,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bTd" = ( @@ -22812,7 +22733,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bUJ" = ( @@ -22980,14 +22903,10 @@ }, /area/station/hallway/primary/central/east) "bVf" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/space, -/area/space/nearstation) +/obj/machinery/atmospherics/binary/pump, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/engine/supermatter) "bVj" = ( /obj/machinery/camera{ c_tag = "Minisat Teleporter Room"; @@ -23491,7 +23410,9 @@ dir = 8; network = list("SS13","Minisat") }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bXo" = ( @@ -25985,17 +25906,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/port) -"che" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "chi" = ( /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -32303,14 +32213,6 @@ icon_state = "neutral" }, /area/station/maintenance/dormitory_maintenance) -"cJs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "cJz" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -39655,6 +39557,35 @@ icon_state = "darkred" }, /area/station/security/range) +"dsh" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/aisat) "dsn" = ( /obj/machinery/constructable_frame/machine_frame, /obj/item/circuitboard/cyborgrecharger, @@ -41657,26 +41588,6 @@ "dEC" = ( /turf/simulated/floor/engine, /area/station/science/explab/chamber) -"dEE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "dEH" = ( /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ @@ -41828,10 +41739,6 @@ }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) -"dFi" = ( -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "dFm" = ( /turf/simulated/wall/r_wall, /area/station/science/storage) @@ -41980,15 +41887,6 @@ icon_state = "neutral" }, /area/station/maintenance/apmaint) -"dFZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/controlroom) "dGf" = ( /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -44480,6 +44378,11 @@ "dTy" = ( /turf/simulated/wall/r_wall, /area/station/security/checkpoint/south) +"dTB" = ( +/obj/structure/grille, +/obj/structure/lattice, +/turf/space, +/area/space) "dTC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -45096,18 +44999,6 @@ }, /turf/simulated/floor/plating, /area/station/engineering/control) -"dWj" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "dWk" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -46476,15 +46367,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) -"eiU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "caution" - }, -/area/station/engineering/controlroom) "eiX" = ( /turf/simulated/floor/transparent/glass, /area/station/maintenance/virology_maint) @@ -47202,6 +47084,28 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/research) +"ewv" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "ewF" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -47286,9 +47190,6 @@ }, /area/station/security/warden) "exZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/binary/pump{ dir = 4 }, @@ -47636,16 +47537,6 @@ }, /turf/simulated/floor/carpet, /area/station/command/office/hop) -"eEd" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/radio/intercom/directional/south, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "eEl" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /obj/effect/spawner/random_spawners/fungus_probably, @@ -47696,18 +47587,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/science/research) -"eFV" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "eFX" = ( /obj/structure/chair/sofa/right{ color = "#A30FAF"; @@ -47812,6 +47691,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "eId" = ( @@ -48202,21 +48086,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "ePt" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "yellow" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ePD" = ( /obj/machinery/navbeacon{ @@ -49056,20 +48929,15 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "fhC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "fhF" = ( /turf/space, @@ -49194,18 +49062,11 @@ /turf/simulated/floor/plating, /area/station/legal/courtroom) "fjw" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 }, +/obj/effect/spawner/window/reinforced/plasma/grilled, +/turf/simulated/floor/plating, /area/station/engineering/controlroom) "fjF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -49503,6 +49364,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "fpj" = ( @@ -50145,15 +50009,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"fzx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "caution" - }, -/area/station/engineering/controlroom) "fzE" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -50273,9 +50128,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "fCZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -50874,6 +50726,13 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) +"fNS" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/engine/supermatter) "fOa" = ( /obj/effect/turf_decal/delivery/hollow, /obj/machinery/floodlight, @@ -50902,11 +50761,6 @@ icon_state = "escape" }, /area/station/bridge/checkpoint/south) -"fOs" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/space, -/area/space/nearstation) "fOy" = ( /obj/item/kirbyplants, /obj/effect/turf_decal/delivery/hollow, @@ -51565,6 +51419,10 @@ /obj/machinery/newscaster/directional/south, /turf/simulated/floor/carpet, /area/station/medical/psych) +"fXC" = ( +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "fXQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -51636,6 +51494,20 @@ icon_state = "redyellowfull" }, /area/station/maintenance/old_kitchen) +"fZy" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/space, +/area/space) "fZJ" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -51727,21 +51599,20 @@ }, /area/station/hallway/primary/central) "gba" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/atmospherics/trinary/tvalve/digital{ + dir = 8 }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, /obj/structure/cable{ - d1 = 4; + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gbe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -51850,6 +51721,26 @@ icon_state = "darkred" }, /area/station/security/evidence) +"gdE" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/south, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "gdK" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -52928,11 +52819,6 @@ /obj/machinery/alarm/engine{ pixel_y = 24 }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/plasteel, /area/station/engineering/engine/supermatter) "gxr" = ( @@ -53123,7 +53009,6 @@ }, /area/station/medical/morgue) "gBo" = ( -/obj/item/kirbyplants, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53136,6 +53021,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gBF" = ( @@ -53143,6 +53031,12 @@ /obj/item/clothing/head/welding/flamedecal/blue{ pixel_y = 5 }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/small/directional/south{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gBH" = ( @@ -53523,6 +53417,30 @@ icon_state = "neutralfull" }, /area/station/security/lobby) +"gJy" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/atmospherics/meter, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/aisat) "gJA" = ( /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ @@ -54997,6 +54915,28 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/security/warden) +"hjH" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "hjJ" = ( /obj/machinery/sleeper{ dir = 4 @@ -55206,20 +55146,15 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "hox" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + icon_state = "4-8" }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "hoG" = ( /obj/effect/decal/cleanable/dirt, @@ -55619,13 +55554,15 @@ }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) +"hwq" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/space, +/area/space) "hwu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -55740,6 +55677,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "hxP" = ( @@ -56149,11 +56091,6 @@ }, /area/station/maintenance/apmaint) "hEn" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, @@ -56163,6 +56100,10 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/power/emitter, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "hEF" = ( @@ -56291,12 +56232,6 @@ icon_state = "neutralfull" }, /area/station/security/checkpoint/south) -"hGx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "hGN" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/north, @@ -56653,16 +56588,12 @@ }, /area/station/security/brig) "hLA" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -57487,11 +57418,9 @@ }, /area/station/security/permabrig) "hZW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + dir = 1; + icon_state = "yellowcorner" }, /area/station/engineering/controlroom) "iaw" = ( @@ -58520,17 +58449,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/station/service/theatre) -"iqR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ird" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -58930,6 +58848,39 @@ }, /turf/simulated/floor/plating, /area/station/science/toxins/launch) +"ixt" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/camera{ + c_tag = "Minisat Power Station"; + dir = 8; + network = list("SS13","Minisat") + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/structure/showcase{ + density = 0; + dir = 4; + icon = 'icons/mob/robots.dmi'; + icon_state = "robot_old"; + name = "Cyborg Statue"; + pixel_x = -9; + pixel_y = 2 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plating, +/area/station/turret_protected/aisat) "ixA" = ( /obj/effect/turf_decal/delivery/hollow, /obj/machinery/recharge_station, @@ -58998,19 +58949,6 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/aft) -"iyC" = ( -/obj/machinery/atmospherics/trinary/tvalve/digital{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "ize" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -59427,6 +59365,29 @@ }, /turf/simulated/floor/plating, /area/station/engineering/controlroom) +"iGO" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "iHc" = ( /obj/structure/closet/crate/can, /obj/structure/window/reinforced{ @@ -60200,14 +60161,6 @@ "iVy" = ( /turf/simulated/wall, /area/station/security/range) -"iVF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "iVI" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil, @@ -60424,11 +60377,8 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "iZL" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/effect/turf_decal/stripes/corner{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -60832,13 +60782,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/warden) -"jhz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/economy/atm/east, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "jhD" = ( /obj/machinery/computer/security{ dir = 1 @@ -60860,7 +60803,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, @@ -60878,9 +60820,6 @@ }, /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) -"jhJ" = ( -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) "jhM" = ( /obj/structure/table/glass, /obj/item/stack/packageWrap{ @@ -61532,22 +61471,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jqX" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "jqZ" = ( /obj/structure/table/wood, @@ -63572,12 +63499,17 @@ /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "kaO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable{ + d1 = 4; d2 = 8; - icon_state = "0-8" + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/engine, /area/station/engineering/controlroom) "kaP" = ( /obj/machinery/light/directional/south, @@ -63823,6 +63755,16 @@ icon_state = "neutral" }, /area/station/maintenance/apmaint) +"ker" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/delivery/hollow, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ket" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -64428,10 +64370,6 @@ /obj/effect/spawner/random_spawners/fungus_probably, /turf/simulated/wall, /area/station/maintenance/old_kitchen) -"kqp" = ( -/obj/machinery/light/small/directional/north, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "kqF" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -64453,15 +64391,6 @@ icon_state = "darkblue" }, /area/station/medical/morgue) -"krr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "krw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64596,19 +64525,12 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "kur" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/power/emitter, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellowcorner" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "kut" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -64633,16 +64555,15 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "kuJ" = ( -/obj/machinery/atmospherics/unary/thermomachine/freezer{ - dir = 4 +/obj/machinery/power/emitter{ + anchored = 1; + dir = 1; + state = 2 }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellowcorner" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "kuK" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, @@ -65477,8 +65398,11 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "kJd" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "kJV" = ( @@ -65586,6 +65510,27 @@ icon_state = "redfull" }, /area/station/security/brig) +"kMh" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/wall/r_wall, +/area/station/turret_protected/aisat) "kMn" = ( /obj/machinery/hologram/holopad{ pixel_x = 16 @@ -66311,10 +66256,19 @@ }, /area/station/medical/chemistry) "kXZ" = ( +/obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 }, -/turf/simulated/floor/plasteel/dark, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, /area/station/engineering/atmos) "kYh" = ( /obj/structure/table/wood, @@ -67314,21 +67268,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "lqL" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/effect/turf_decal/stripes, +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plating, /area/station/engineering/controlroom) "lrb" = ( /obj/structure/cable{ @@ -68666,16 +68612,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "lNO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "lOk" = ( @@ -69190,24 +69129,14 @@ }, /area/station/medical/virology) "lWo" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/structure/reflector/box, -/turf/simulated/floor/engine, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "lWq" = ( /obj/structure/closet, @@ -70526,18 +70455,13 @@ }, /area/station/security/brig) "mxG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/kirbyplants, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/obj/structure/lattice/catwalk, +/turf/space, +/area/station/maintenance/auxsolarport) "myf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71204,11 +71128,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"mPO" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/station/engineering/controlroom) "mPR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71244,6 +71163,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "mPZ" = ( @@ -71537,9 +71461,14 @@ }, /area/station/medical/reception) "mTu" = ( -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "mTw" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/wood/oak, @@ -71827,15 +71756,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/research) -"mZv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "mZR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -71936,6 +71856,26 @@ /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) +"naT" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/light/directional/north, +/obj/machinery/ai_status_display/north, +/obj/machinery/teleport/station, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/porta_turret, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/station/turret_protected/aisat) "naX" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -71974,14 +71914,18 @@ }, /area/station/security/processing) "nbG" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "nch" = ( @@ -72505,6 +72449,30 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) +"nks" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/power/terminal, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "nkB" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -74044,14 +74012,6 @@ icon_state = "seadeep" }, /area/station/public/fitness) -"nIM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "nJn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -74627,7 +74587,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "nRz" = ( @@ -74771,9 +74733,9 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "nUp" = ( @@ -74826,30 +74788,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) -"nUR" = ( -/obj/machinery/camera{ - c_tag = "Supermatter North"; - network = list("SS13","Engineering") - }, -/obj/structure/reflector/box, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "nVf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -74979,6 +74917,29 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) +"nWY" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/corner, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "nXa" = ( /obj/structure/table/reinforced, /obj/item/clipboard{ @@ -75139,17 +75100,6 @@ icon_state = "neutralfull" }, /area/station/public/fitness) -"oan" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/economy/vending/wallmed/directional/south, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "oav" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/peppermill, @@ -75397,20 +75347,6 @@ }, /turf/simulated/floor/plating, /area/station/science/robotics/showroom) -"oeZ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "off" = ( /turf/simulated/floor/plasteel{ icon_state = "red" @@ -75850,16 +75786,6 @@ "omV" = ( /turf/simulated/wall/r_wall, /area/station/medical/storage/secondary) -"onA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/chair, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "onD" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -76073,8 +75999,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/dormitory_maintenance) "oql" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -76165,6 +76091,35 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"orS" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/structure/showcase{ + density = 0; + dir = 4; + icon = 'icons/mob/robots.dmi'; + icon_state = "robot_old"; + name = "Cyborg Statue"; + pixel_x = -9; + pixel_y = 2 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/lattice, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/space, +/area/space/nearstation) "osf" = ( /obj/effect/decal/cleanable/ants, /turf/simulated/floor/plasteel{ @@ -76576,15 +76531,25 @@ }, /area/station/hallway/primary/port) "oAP" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/structure/chair, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/engineering/controlroom) "oAU" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -77054,24 +77019,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oKV" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/power/emitter, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "yellow" }, -/obj/structure/reflector/box, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/engine, /area/station/engineering/controlroom) "oLg" = ( /obj/structure/cable{ @@ -77568,10 +77520,6 @@ dir = 1 }, /obj/machinery/power/apc/super/north, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/plasteel, /area/station/engineering/engine/supermatter) "oVE" = ( @@ -78359,6 +78307,13 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "piq" = ( @@ -79490,14 +79445,6 @@ icon_state = "darkredcorners" }, /area/station/security/brig) -"pAQ" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/station/engineering/controlroom) "pAT" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -79978,7 +79925,27 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "pJf" = ( -/turf/simulated/floor/engine, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table/reinforced, +/obj/item/tank/internals/plasma, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "pJj" = ( /obj/effect/decal/cleanable/generic, @@ -79994,12 +79961,22 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "pJw" = ( +/obj/machinery/light/directional/west, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 8 }, -/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/engineering/controlroom) "pJP" = ( /obj/machinery/light/small/directional/south, /obj/machinery/power/smes, @@ -80287,9 +80264,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "pOi" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, +/obj/machinery/economy/atm/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "pOp" = ( @@ -80522,6 +80500,9 @@ }, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/nitrogen, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "pSM" = ( @@ -80788,6 +80769,19 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) +"pYn" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/wall, +/area/station/hallway/secondary/entry) "pYo" = ( /obj/structure/coatrack, /turf/simulated/floor/plasteel{ @@ -80896,13 +80890,6 @@ }, /turf/simulated/wall/r_wall, /area/station/engineering/atmos/control) -"qaS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "qbb" = ( /obj/structure/window/reinforced{ dir = 4 @@ -81020,17 +81007,13 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "qdk" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry) "qdm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -81040,12 +81023,15 @@ }, /area/station/medical/sleeper) "qdE" = ( +/obj/effect/turf_decal/delivery/hollow, /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 }, -/obj/machinery/light/directional/north, +/obj/structure/table/reinforced, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/engineering/controlroom) "qdW" = ( /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, @@ -81230,9 +81216,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -82499,22 +82482,12 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "qEN" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reflector/box{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) +/obj/effect/spawner/window/reinforced/plasma/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/engine/supermatter) "qEO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -82606,6 +82579,32 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) +"qFY" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/trinary/filter{ + dir = 4; + filter_type = "o2"; + on = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "qGa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -83172,6 +83171,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "qPc" = ( @@ -83616,15 +83618,6 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) -"qWG" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "qWV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -84135,17 +84128,22 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "rfH" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/cable{ - d1 = 4; +/obj/structure/cable/yellow{ + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "rfK" = ( /obj/structure/disposalpipe/segment{ @@ -84195,17 +84193,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) -"rfT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "rgg" = ( /obj/machinery/fishtank/wall, /turf/simulated/wall, @@ -84513,6 +84500,27 @@ icon_state = "neutralfull" }, /area/station/public/storage/tools) +"rme" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "rmw" = ( /obj/machinery/door/window/reinforced/normal{ dir = 8 @@ -85061,14 +85069,6 @@ /obj/structure/table/reinforced, /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) -"rwj" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "rwn" = ( /obj/effect/spawner/lootdrop/trash, /turf/simulated/floor/plating, @@ -85322,20 +85322,6 @@ icon_state = "white" }, /area/station/medical/chemistry) -"rAC" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "rAL" = ( /obj/machinery/power/apc/directional/west, /obj/structure/cable{ @@ -86953,15 +86939,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"sdI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/controlroom) "sea" = ( /obj/structure/cable{ d1 = 4; @@ -88085,16 +88062,15 @@ }, /area/station/service/janitor) "syc" = ( -/obj/machinery/power/emitter{ - dir = 4 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/structure/table/reinforced, +/obj/item/paper/sm_paper, +/obj/machinery/sm_drop_controll_buttons{ + req_access_txt = "56"; + pixel_x = 8; + pixel_y = -16 }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel/dark, +/area/station/command/office/ce) "syi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -89239,16 +89215,17 @@ /turf/simulated/floor/carpet, /area/station/service/library) "sQZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -89817,13 +89794,13 @@ /turf/simulated/wall, /area/station/maintenance/virology_maint) "tep" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "teI" = ( /obj/structure/cable{ @@ -91135,28 +91112,6 @@ icon_state = "Dark" }, /area/station/medical/virology) -"tCX" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/reflector/box{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "tCY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -91193,22 +91148,21 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "tEe" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, /obj/structure/cable{ - d2 = 4; - icon_state = "0-4" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "tEi" = ( /turf/simulated/floor/plasteel{ @@ -91927,16 +91881,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "tQK" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/power/emitter{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) +/obj/structure/grille, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) "tQS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -92098,12 +92046,13 @@ }, /area/station/maintenance/port) "tUw" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/structure/reflector/box{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/engine, /area/station/engineering/controlroom) "tUS" = ( /obj/structure/table/reinforced, @@ -92396,26 +92345,14 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/evidence) "tYw" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/structure/reflector/box{ - dir = 8 +/obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/engine, /area/station/engineering/controlroom) "tYB" = ( /obj/machinery/atmospherics/unary/portables_connector{ @@ -92861,12 +92798,6 @@ icon_state = "white" }, /area/station/medical/sleeper) -"ufU" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "uge" = ( /obj/structure/cable{ d1 = 4; @@ -93204,23 +93135,16 @@ }, /area/station/security/storage) "uly" = ( +/obj/machinery/light/directional/east, /obj/structure/cable/yellow{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 + d2 = 2; + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/corner{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ulI" = ( @@ -93371,15 +93295,6 @@ icon_state = "neutral" }, /area/station/maintenance/fore2) -"uoQ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "uoR" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -93654,6 +93569,19 @@ }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) +"uud" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/space, +/area/space) "uuE" = ( /obj/structure/chair{ dir = 4 @@ -93965,23 +93893,14 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) "uBp" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/structure/window/plasmareinforced{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/station/engineering/controlroom) +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "uBD" = ( /obj/structure/cable{ d1 = 1; @@ -94087,6 +94006,11 @@ icon_state = "cmo" }, /area/station/medical/break_room) +"uEC" = ( +/obj/structure/grille, +/obj/structure/lattice, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "uFe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -94294,10 +94218,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/analyzer, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uJu" = ( /obj/machinery/atmospherics/portable/scrubber/huge/stationary, @@ -94570,8 +94497,8 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "uMY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -94665,11 +94592,20 @@ }, /area/station/service/expedition) "uNZ" = ( -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/station/maintenance/turbine) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "uOa" = ( /obj/item/chair/light, /obj/effect/decal/cleanable/dirt, @@ -94865,17 +94801,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/execution) "uQW" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/analyzer, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uRf" = ( @@ -95148,24 +95073,6 @@ }, /turf/simulated/floor/engine, /area/station/science/test_chamber) -"uUh" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/station/engineering/controlroom) "uUo" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -95445,17 +95352,18 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "uYk" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/area/station/hallway/secondary/entry) +/obj/machinery/atmospherics/portable/canister/toxins, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "uYD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -97147,6 +97055,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "vHD" = ( @@ -97322,21 +97233,6 @@ icon_state = "neutralfull" }, /area/station/maintenance/starboard2) -"vJN" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/dispenser, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "vJP" = ( /obj/machinery/door/airlock/external{ id_tag = "escape_door_int"; @@ -97384,15 +97280,6 @@ }, /turf/simulated/floor/grass, /area/station/science/research) -"vKK" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "vLh" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -97567,14 +97454,17 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "vOo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/sm_drop_controll_buttons{ + req_access_txt = "56"; + pixel_x = 8; + pixel_y = -16 }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/controlroom) +/turf/space, +/area/space/nearstation) "vOA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -97956,17 +97846,6 @@ icon_state = "white" }, /area/station/medical/virology) -"vVB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/secondary/entry) "vVF" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -98369,6 +98248,9 @@ }, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/nitrogen, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "waT" = ( @@ -99150,11 +99032,6 @@ "wpW" = ( /turf/simulated/wall, /area/station/maintenance/dormitory_maintenance) -"wqp" = ( -/obj/structure/cable, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/engine, -/area/station/engineering/controlroom) "wqG" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "hos_room" @@ -99449,21 +99326,9 @@ }, /area/station/medical/medbay2) "wwE" = ( -/obj/machinery/camera{ - c_tag = "Supermatter West"; - dir = 4; - network = list("Engineering","SS13"); - pixel_y = -22 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/unary/thermomachine/freezer{ +/obj/structure/reflector/box{ dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "wwR" = ( @@ -99606,6 +99471,27 @@ icon_state = "yellow" }, /area/station/engineering/control) +"wzM" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "wzN" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -99641,6 +99527,24 @@ }, /turf/simulated/floor/plating, /area/station/security/brig) +"wAp" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/wall/r_wall, +/area/station/engineering/controlroom) "wAU" = ( /obj/effect/mapping_helpers/airlock/polarized{ id = "HoS" @@ -100360,25 +100264,14 @@ }, /area/station/security/brig) "wQE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "wQG" = ( /obj/structure/cable{ @@ -100401,6 +100294,22 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) +"wQS" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "wRa" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -101457,21 +101366,6 @@ /obj/structure/railing/corner, /turf/simulated/floor/wood/fancy, /area/station/service/theatre) -"xiD" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/portable/canister/toxins, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "xjh" = ( /obj/machinery/door_control/bolt_control/north{ id = "maintcabin1" @@ -102382,6 +102276,32 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) +"xzF" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "xzH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -103244,6 +103164,20 @@ icon_state = "yellow" }, /area/station/engineering/break_room) +"xNL" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/structure/lattice, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/space, +/area/space/nearstation) "xNW" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -104129,6 +104063,34 @@ icon_state = "neutralcorner" }, /area/station/maintenance/starboard2) +"ycN" = ( +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: <<<" + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/radio/intercom/directional/south, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: ---" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/item/radio/intercom/directional/south, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/merge_conflict_marker{ + name = "Merge Conflict Marker: >>>" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ycZ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -104250,9 +104212,6 @@ /turf/simulated/wall, /area/station/public/sleep_male) "ygd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/binary/pump{ dir = 8 }, @@ -104800,220 +104759,8 @@ aaa aaa aaa aaa -"} -(2,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(2,1,1) = {" aaa aaa aaa @@ -105057,8 +104804,6 @@ aaa aaa aaa aaa -"} -(3,1,1) = {" aaa aaa aaa @@ -105271,6 +105016,8 @@ aaa aaa aaa aaa +"} +(3,1,1) = {" aaa aaa aaa @@ -105314,8 +105061,6 @@ aaa aaa aaa aaa -"} -(4,1,1) = {" aaa aaa aaa @@ -105528,6 +105273,8 @@ aaa aaa aaa aaa +"} +(4,1,1) = {" aaa aaa aaa @@ -105571,8 +105318,6 @@ aaa aaa aaa aaa -"} -(5,1,1) = {" aaa aaa aaa @@ -105785,6 +105530,8 @@ aaa aaa aaa aaa +"} +(5,1,1) = {" aaa aaa aaa @@ -105828,8 +105575,6 @@ aaa aaa aaa aaa -"} -(6,1,1) = {" aaa aaa aaa @@ -106042,6 +105787,8 @@ aaa aaa aaa aaa +"} +(6,1,1) = {" aaa aaa aaa @@ -106085,8 +105832,6 @@ aaa aaa aaa aaa -"} -(7,1,1) = {" aaa aaa aaa @@ -106299,6 +106044,8 @@ aaa aaa aaa aaa +"} +(7,1,1) = {" aaa aaa aaa @@ -106342,8 +106089,6 @@ aaa aaa aaa aaa -"} -(8,1,1) = {" aaa aaa aaa @@ -106556,6 +106301,8 @@ aaa aaa aaa aaa +"} +(8,1,1) = {" aaa aaa aaa @@ -106599,8 +106346,6 @@ aaa aaa aaa aaa -"} -(9,1,1) = {" aaa aaa aaa @@ -106813,6 +106558,8 @@ aaa aaa aaa aaa +"} +(9,1,1) = {" aaa aaa aaa @@ -106856,8 +106603,6 @@ aaa aaa aaa aaa -"} -(10,1,1) = {" aaa aaa aaa @@ -107070,6 +106815,8 @@ aaa aaa aaa aaa +"} +(10,1,1) = {" aaa aaa aaa @@ -107113,8 +106860,6 @@ aaa aaa aaa aaa -"} -(11,1,1) = {" aaa aaa aaa @@ -107327,6 +107072,8 @@ aaa aaa aaa aaa +"} +(11,1,1) = {" aaa aaa aaa @@ -107370,8 +107117,6 @@ aaa aaa aaa aaa -"} -(12,1,1) = {" aaa aaa aaa @@ -107487,17 +107232,6 @@ aaa aaa aaa aaa -bmo -bpm -pVN -bpm -pVN -bpm -bmo -bmo -bmo -bmo -bmo aaa aaa aaa @@ -107595,6 +107329,8 @@ aaa aaa aaa aaa +"} +(12,1,1) = {" aaa aaa aaa @@ -107627,8 +107363,6 @@ aaa aaa aaa aaa -"} -(13,1,1) = {" aaa aaa aaa @@ -107743,19 +107477,6 @@ aaa aaa aaa aaa -bkt -bpn -brp -brp -brp -bRr -blv -blO -brp -brp -brp -cpb -bLR aaa aaa aaa @@ -107865,6 +107586,8 @@ aaa aaa aaa aaa +"} +(13,1,1) = {" aaa aaa aaa @@ -107884,8 +107607,6 @@ aaa aaa aaa aaa -"} -(14,1,1) = {" aaa aaa aaa @@ -108000,19 +107721,180 @@ aaa aaa aaa aaa -bku -bpo -bLM -kVT -bPC -bRs -bTs -bVH -brq -bms -bnR -bpo -brr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +"} +(14,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -108141,8 +108023,6 @@ aaa aaa aaa aaa -"} -(15,1,1) = {" aaa aaa aaa @@ -108220,6 +108100,8 @@ aaa aaa aaa aaa +"} +(15,1,1) = {" aaa aaa aaa @@ -108244,32 +108126,6 @@ aaa aaa aaa aaa -abj -bpm -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bPR -bpo -brr -bNM -bNM -bNM -bTt -bNM -bNM -bNM -bkt -bpo -bLR aaa aaa aaa @@ -108398,8 +108254,6 @@ aaa aaa aaa aaa -"} -(16,1,1) = {" aaa aaa aaa @@ -108501,34 +108355,10 @@ aaa aaa aaa aaa -bku -bpn -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -bJQ -brs -bNM -bPG -bRx -bTu -bVJ -ccx -bNM -bkt -lvH -brr aaa aaa +"} +(16,1,1) = {" aaa aaa aaa @@ -108644,6 +108474,17 @@ aaa aaa aaa aaa +bmo +bpm +pVN +bpm +orS +bpm +bmo +bmo +bmo +bmo +bmo aaa aaa aaa @@ -108655,8 +108496,6 @@ aaa aaa aaa aaa -"} -(17,1,1) = {" aaa aaa aaa @@ -108758,37 +108597,7 @@ aaa aaa aaa aaa -ops -bpo -brq -bpu -bms -bms -rNb -bpu -bms -bms -bpu -bms -bms -bpu -bms aaa -bNM -bPH -bSr -bTv -bXI -cgI -bNM -bkt -lvH -dSz -pVN -bpm -pVN -bmo -bpm aaa aaa aaa @@ -108805,6 +108614,8 @@ aaa aaa aaa aaa +"} +(17,1,1) = {" aaa aaa aaa @@ -108912,8 +108723,6 @@ aaa aaa aaa aaa -"} -(18,1,1) = {" aaa aaa aaa @@ -108921,6 +108730,19 @@ aaa aaa aaa aaa +bkt +bpn +brp +brp +brp +gJy +blv +blO +brp +brp +brp +cpb +bLR aaa aaa aaa @@ -109015,38 +108837,6 @@ aaa aaa aaa aaa -bkt -bpo -brr -abj -abj -abj -btd -btd -btd -btd -btd -btd -btd -btd -btd -btd -bNM -bPO -bTc -bTw -bVL -chu -bNM -bku -boe -mRz -mRz -mRz -mRz -brp -cpb -brs aaa aaa aaa @@ -109081,6 +108871,8 @@ aaa aaa aaa aaa +"} +(18,1,1) = {" aaa aaa aaa @@ -109169,8 +108961,6 @@ aaa aaa aaa aaa -"} -(19,1,1) = {" aaa aaa aaa @@ -109197,6 +108987,19 @@ aaa aaa aaa aaa +bku +bpo +bLM +kVT +bPC +dsh +bTs +bVH +brq +bms +bnR +bpo +brr aaa aaa aaa @@ -109272,38 +109075,7 @@ aaa aaa aaa aaa -bku -bpo -brs -abj -abj -btd -btd -btd -bzv -btd -btd -btd -bvz -btd -bzv -btd -bNM -bPP -bUD -hzl -bXI -chE -bNM aaa -bpu -bms -bms -bpu -bms -bPC -bpo -brs aaa aaa aaa @@ -109356,6 +109128,8 @@ aaa aaa aaa aaa +"} +(19,1,1) = {" aaa aaa aaa @@ -109426,8 +109200,6 @@ aaa aaa aaa aaa -"} -(20,1,1) = {" aaa aaa aaa @@ -109459,6 +109231,34 @@ aaa aaa aaa aaa +abj +bpm +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bPR +bpo +brr +bNM +bNM +kMh +bTt +bNM +bNM +bNM +bkt +bpo +bLR +aaa +aaa aaa aaa aaa @@ -109529,38 +109329,7 @@ aaa aaa aaa aaa -ops -bpo -brs aaa -btd -btd -btd -bxX -bzw -btd -bCT -btd -bzw -bzD -bJR -btd -bNM -bPQ -bXm -bTI -bVN -cmx -bNM -qrT -qrT -qrT -qrT -qrT -abj -bku -bpo -brs aaa aaa aaa @@ -109616,6 +109385,8 @@ aaa aaa aaa aaa +"} +(20,1,1) = {" aaa aaa aaa @@ -109683,8 +109454,6 @@ aaa aaa aaa aaa -"} -(21,1,1) = {" aaa aaa aaa @@ -109719,6 +109488,32 @@ aaa aaa aaa aaa +bku +bpn +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +bJQ +brs +bNM +bPG +ixt +bTu +bVJ +ccx +bNM +bkt +lvH +brr aaa aaa aaa @@ -109786,38 +109581,6 @@ aaa aaa aaa aaa -bku -bpo -brr -abj -btd -btd -bwG -bxY -byg -bBd -bCU -bwG -bBf -bxY -bBf -tEw -bNM -bNM -bNM -bTz -bNM -bNM -bNM -qrT -qrT -qrT -qrT -qrT -qrT -bkt -bpo -brs aaa aaa aaa @@ -109879,6 +109642,8 @@ aaa aaa aaa aaa +"} +(21,1,1) = {" aaa aaa aaa @@ -109940,8 +109705,6 @@ aaa aaa aaa aaa -"} -(22,1,1) = {" aaa aaa aaa @@ -109982,7 +109745,37 @@ aaa aaa aaa aaa +ops +bpo +brq +bpu +bms +bms +rNb +bpu +bms +bms +bpu +bms +bms +bpu +bms aaa +bNM +bPH +bSr +bTv +bXI +cgI +bNM +bkt +lvH +dSz +pVN +bpm +pVN +bmo +bpm aaa aaa aaa @@ -110042,40 +109835,7 @@ aaa aaa aaa aaa -bmo -bnM -bpo -brs aaa -btd -bvz -bLQ -bxZ -bzy -bIh -bCV -bIh -bIh -bIh -bJS -bwH -bNN -bPI -bVO -bTG -bVO -bPI -bNM -qrT -rSI -vzz -eaH -qrT -qrT -bkt -bpo -bLS -bmo aaa aaa aaa @@ -110139,6 +109899,8 @@ aaa aaa aaa aaa +"} +(22,1,1) = {" aaa aaa aaa @@ -110197,8 +109959,6 @@ aaa aaa aaa aaa -"} -(23,1,1) = {" aaa aaa aaa @@ -110242,6 +110002,38 @@ aaa aaa aaa aaa +bkt +bpo +brr +abj +abj +abj +btd +btd +btd +btd +btd +btd +btd +btd +btd +btd +bNM +bPO +bTc +bTw +bVL +chu +bNM +bku +boe +mRz +mRz +mRz +mRz +brp +cpb +brs aaa aaa aaa @@ -110298,42 +110090,6 @@ aaa aaa aaa aaa -bkt -bmp -cqK -bpq -brr -btd -btd -btd -bBg -bye -bzz -bBf -bEF -bBf -bBf -bgN -bJT -bLO -bNM -bPJ -bRz -bTB -bVS -bXH -bNM -caV -caW -fmm -fmm -chX -qrT -bku -bmq -cqK -csk -brs aaa aaa aaa @@ -110400,6 +110156,34 @@ aaa aaa aaa aaa +"} +(23,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110454,8 +110238,6 @@ aaa aaa aaa aaa -"} -(24,1,1) = {" aaa aaa aaa @@ -110477,6 +110259,38 @@ aaa aaa aaa aaa +bku +bpo +brs +abj +abj +btd +btd +btd +bzv +btd +btd +btd +bvz +btd +bzv +btd +bNM +bPP +bUD +hzl +bXI +chE +bNM +aaa +bpu +bms +bms +bpu +bms +bPC +bpo +brs aaa aaa aaa @@ -110555,58 +110369,6 @@ aaa aaa aaa aaa -bku -bmq -bnO -bpq -brs -btd -btd -byg -bBf -bye -bBf -btd -btd -bIi -naX -bwJ -bhV -bNL -bNM -bSo -bVS -bTE -bVS -bXI -qrT -ccU -caW -ceP -fmm -fBl -qrT -bkt -bmq -cqL -bpq -brs -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -110651,6 +110413,8 @@ aaa aaa aaa aaa +"} +(24,1,1) = {" aaa aaa aaa @@ -110711,9 +110475,6 @@ aaa aaa aaa aaa -"} -(25,1,1) = {" -aaa aaa aaa aaa @@ -110755,7 +110516,38 @@ aaa aaa aaa aaa +ops +bpo +brs aaa +btd +btd +btd +bxX +bzw +btd +bCT +btd +bzw +bzD +bJR +btd +bNM +bPQ +bXm +bTI +bVN +cmx +bNM +qrT +qrT +qrT +qrT +qrT +abj +bku +bpo +brs aaa aaa aaa @@ -110812,42 +110604,6 @@ aaa aaa aaa aaa -bkt -bav -bnP -btk -nLK -btd -btd -bwF -bwK -byc -bCY -btd -bCX -bEE -btd -bIj -bJU -biX -bNP -bPL -bRB -bTD -bVR -bXJ -bZh -caX -boh -cgu -ccW -chW -qrT -jnD -bav -bnP -btk -brs aaa aaa aaa @@ -110914,6 +110670,8 @@ aaa aaa aaa aaa +"} +(25,1,1) = {" aaa aaa aaa @@ -110968,8 +110726,6 @@ aaa aaa aaa aaa -"} -(26,1,1) = {" aaa aaa aaa @@ -111017,6 +110773,38 @@ aaa aaa aaa aaa +bku +bpo +brr +abj +btd +btd +bwG +bxY +byg +bBd +bCU +bwG +bBf +bxY +bBf +tEw +bNM +bNM +bNM +bTz +bNM +bNM +bNM +qrT +qrT +qrT +qrT +qrT +qrT +bkt +bpo +brs aaa aaa aaa @@ -111069,42 +110857,6 @@ aaa aaa aaa aaa -bku -baE -bcA -bdZ -brs -btd -btd -bvC -bwJ -byd -bBf -btd -btd -bIk -naX -bwJ -bJV -bBf -bNM -bXI -bVS -bTE -bVS -bXI -oMr -caY -ccX -ceP -fmm -vDg -qrT -bkt -brT -bsb -btx -brs aaa aaa aaa @@ -111175,6 +110927,8 @@ aaa aaa aaa aaa +"} +(26,1,1) = {" aaa aaa aaa @@ -111225,8 +110979,6 @@ aaa aaa aaa aaa -"} -(27,1,1) = {" aaa aaa aaa @@ -111277,7 +111029,40 @@ aaa aaa aaa aaa +bmo +bnM +bpo +brs aaa +btd +bvz +bLQ +bxZ +bzy +bIh +bCV +bIh +bIh +bIh +bJS +bwH +bNN +bPI +bVO +bTG +bVO +bPI +bNM +qrT +rSI +vzz +eaH +qrT +qrT +bkt +bpo +bLS +bmo aaa aaa aaa @@ -111326,42 +111111,6 @@ aaa aaa aaa aaa -ops -bmr -cqM -bps -brr -btd -btd -btd -bCW -byd -bzA -bBf -bED -bBf -bBf -bIl -bip -bBf -bNM -bPJ -bRD -bTF -bVS -bXK -bNM -caV -ccX -fmm -fmm -chX -qrT -bku -cpd -cqM -csl -brs aaa aaa aaa @@ -111435,6 +111184,8 @@ aaa aaa aaa aaa +"} +(27,1,1) = {" aaa aaa aaa @@ -111482,8 +111233,6 @@ aaa aaa aaa aaa -"} -(28,1,1) = {" aaa aaa aaa @@ -111536,6 +111285,42 @@ aaa aaa aaa aaa +bkt +bmp +cqK +bpq +brr +btd +btd +btd +bBg +bye +bzz +bBf +bEF +bBf +bBf +bgN +bJT +bLO +bNM +bPJ +bRz +bTB +bVS +bXH +bNM +caV +caW +fmm +fmm +chX +qrT +bku +bmq +cqK +csk +brs aaa aaa aaa @@ -111583,41 +111368,7 @@ aaa aaa aaa aaa -abj -oMO -fPS -bJP -brs aaa -btd -bvz -bLQ -byf -bzB -bIm -bCZ -bIm -bIm -bIm -bJW -bwH -bNR -bPI -bVT -bTG -bVT -bXL -bNM -qrT -bon -ceL -hng -qrT -qrT -bkt -bJP -orz -bpu aaa aaa aaa @@ -111690,6 +111441,8 @@ aaa aaa aaa aaa +"} +(28,1,1) = {" aaa aaa aaa @@ -111739,8 +111492,6 @@ aaa aaa aaa aaa -"} -(29,1,1) = {" aaa aaa aaa @@ -111791,6 +111542,42 @@ aaa aaa aaa aaa +bku +bmq +bnO +bpq +brs +btd +btd +byg +bBf +bye +bBf +btd +btd +bIi +naX +bwJ +bhV +bNL +bNM +bSo +bVS +bTE +bVS +bXI +qrT +ccU +caW +ceP +fmm +fBl +qrT +bkt +bmq +cqL +bpq +brs aaa aaa aaa @@ -111842,38 +111629,6 @@ aaa aaa aaa aaa -bku -bJP -brr -abj -btd -btd -bwG -byg -bIn -bBd -bCU -bwG -bBf -bIn -bBf -uVE -bNM -bNM -bNM -bTH -bNM -bNM -bNM -qrT -qrT -qrT -qrT -qrT -qrT -bkt -bJP -brr aaa aaa aaa @@ -111943,6 +111698,8 @@ aaa aaa aaa aaa +"} +(29,1,1) = {" aaa aaa aaa @@ -111996,8 +111753,6 @@ aaa aaa aaa aaa -"} -(30,1,1) = {" aaa aaa aaa @@ -112044,6 +111799,42 @@ aaa aaa aaa aaa +bkt +bav +bnP +btk +nLK +btd +btd +bwF +bwK +byc +bCY +btd +bCX +bEE +btd +bIj +bJU +biX +bNP +bPL +bRB +bTD +bVR +bXJ +bZh +caX +boh +cgu +ccW +chW +qrT +jnD +bav +bnP +btk +brs aaa aaa aaa @@ -112099,38 +111890,7 @@ aaa aaa aaa aaa -bkt -bJP -brs aaa -btd -btd -btd -byh -bzD -btd -bDa -btd -bGq -bIo -bzw -btd -bNM -bPN -bVj -bTI -bVU -bPN -bNM -qrT -qrT -qrT -qrT -qrT -abj -bku -bJP -bLR aaa aaa aaa @@ -112195,6 +111955,8 @@ aaa aaa aaa aaa +"} +(30,1,1) = {" aaa aaa aaa @@ -112253,8 +112015,6 @@ aaa aaa aaa aaa -"} -(31,1,1) = {" aaa aaa aaa @@ -112296,6 +112056,42 @@ aaa aaa aaa aaa +bku +baE +bcA +bdZ +brs +btd +btd +bvC +bwJ +byd +bBf +btd +btd +bIk +naX +bwJ +bJV +bBf +bNM +bXI +bVS +bTE +bVS +bXI +oMr +caY +ccX +ceP +fmm +vDg +qrT +bkt +brT +bsb +btx +brs aaa aaa aaa @@ -112335,7 +112131,6 @@ aaa aaa aaa aaa -lVg aaa aaa aaa @@ -112356,38 +112151,7 @@ aaa aaa aaa aaa -bkt -bJP -brs -abj -abj -btd -btd -btd -bzv -btd -btd -btd -bvz -btd -bzv -btd -bNM -bQC -bXI -bTL -bXI -bXM -bNM aaa -bpm -bmo -bmo -bpm -bmo -cnY -bJP -brr aaa aaa aaa @@ -112448,6 +112212,22 @@ aaa aaa aaa aaa +"} +(31,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112510,8 +112290,14 @@ aaa aaa aaa aaa -"} -(32,1,1) = {" +aaa +aaa +aaa +aaa +lVg +aaa +aaa +aaa aaa aaa aaa @@ -112527,6 +112313,43 @@ aaa aaa aaa aaa +ops +bmr +cqM +bps +brr +btd +btd +btd +bCW +byd +bzA +bBf +bED +bBf +bBf +bIl +bip +bBf +bNM +bPJ +bRD +bTF +bVS +bXK +bNM +caV +ccX +fmm +fmm +chX +qrT +bku +cpd +cqM +csl +brs +aaa aaa aaa aaa @@ -112613,38 +112436,6 @@ aaa aaa aaa aaa -bkt -bJP -brr -abj -abj -abj -btd -btd -btd -btd -btd -btd -btd -btd -btd -btd -bNM -bQD -bjE -bTK -bXI -bXN -bNM -bku -bJO -pDS -pDS -pDS -pDS -chS -cpe -brs aaa aaa aaa @@ -112678,6 +112469,8 @@ aaa aaa aaa aaa +"} +(32,1,1) = {" aaa aaa aaa @@ -112767,8 +112560,6 @@ aaa aaa aaa aaa -"} -(33,1,1) = {" aaa aaa aaa @@ -112779,6 +112570,42 @@ aaa aaa aaa aaa +abj +oMO +fPS +bJP +brs +aaa +btd +bvz +bLQ +byf +bzB +bIm +bCZ +bIm +bIm +bIm +bJW +bwH +bNR +naT +bVT +bTG +bVT +bXL +bNM +qrT +bon +ceL +hng +qrT +qrT +bkt +bJP +orz +bpu +aaa aaa aaa aaa @@ -112870,37 +112697,7 @@ aaa aaa aaa aaa -bkt -bJP -brw -bpm -bmo -bmo -uDR -bpm -bmo -bmo -bpm -bmo -bmo -bpm -bmo aaa -bNM -bRt -bXI -bTL -bXI -bXO -bNM -bkt -eHx -orz -oMO -bpu -bms -bms -bms aaa aaa aaa @@ -112929,6 +112726,8 @@ aaa aaa aaa aaa +"} +(33,1,1) = {" aaa aaa aaa @@ -113024,14 +112823,47 @@ aaa aaa aaa aaa -"} -(34,1,1) = {" aaa aaa aaa aaa aaa aaa +bku +bJP +brr +abj +btd +btd +bwG +byg +bIn +bBd +bCU +bwG +bBf +bIn +bBf +uVE +bNM +bNM +bNM +bTH +bNM +bNM +bNM +qrT +qrT +qrT +qrT +qrT +qrT +bkt +bJP +brr +aaa +aaa +aaa aaa aaa aaa @@ -113127,32 +112959,6 @@ aaa aaa aaa aaa -bku -bJY -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -bJX -brs -bNM -bPN -czz -blG -bmS -bXP -bNM -bkt -bJP -brr aaa aaa aaa @@ -113177,6 +112983,8 @@ aaa aaa aaa aaa +"} +(34,1,1) = {" aaa aaa aaa @@ -113278,11 +113086,40 @@ aaa aaa aaa aaa +bkt +bJP +brs aaa +btd +btd +btd +byh +bzD +btd +bDa +btd +bGq +bIo +bzw +btd +bNM +bPN +bVj +bTI +bVU +bPN +bNM +qrT +qrT +qrT +qrT +qrT +abj +bku +bJP +bLR aaa aaa -"} -(35,1,1) = {" aaa aaa aaa @@ -113384,32 +113221,6 @@ aaa aaa aaa aaa -abj -bpu -oMO -bms -bms -bms -bms -bms -bms -bms -bms -bms -bpu -fPS -bJP -bLR -bNM -bNM -bNM -bTM -bNM -bNM -bNM -bku -bJP -brs aaa aaa aaa @@ -113429,6 +113240,8 @@ aaa aaa aaa aaa +"} +(35,1,1) = {" aaa aaa aaa @@ -113530,7 +113343,38 @@ aaa aaa aaa aaa +bkt +bJP +brs +abj +abj +btd +btd +btd +bzv +btd +btd +btd +bvz +btd +bzv +btd +bNM +bQC +bXI +bTL +bXI +bXM +bNM aaa +bpm +bmo +bmo +bpm +bmo +cnY +bJP +brr aaa aaa aaa @@ -113538,8 +113382,6 @@ aaa aaa aaa aaa -"} -(36,1,1) = {" aaa aaa aaa @@ -113654,19 +113496,26 @@ aaa aaa aaa aaa -bku -bJP -bLS -wdm -bPR -bRJ -bTN -bVV -brw -bmo -bnM -bJP -brs +aaa +"} +(36,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113751,6 +113600,38 @@ aaa aaa aaa aaa +bkt +bJP +brr +abj +abj +abj +btd +btd +btd +btd +btd +btd +btd +btd +btd +btd +bNM +bQD +bjE +bTK +bXI +bXN +bNM +bku +bJO +pDS +pDS +pDS +pDS +chS +cpe +brs aaa aaa aaa @@ -113795,8 +113676,6 @@ aaa aaa aaa aaa -"} -(37,1,1) = {" aaa aaa aaa @@ -113875,6 +113754,8 @@ aaa aaa aaa aaa +"} +(37,1,1) = {" aaa aaa aaa @@ -113911,19 +113792,6 @@ aaa aaa aaa aaa -bkt -bJY -bLT -chS -chS -bVW -bTO -bVW -chS -chS -chS -cpe -brs aaa aaa aaa @@ -113976,9 +113844,7 @@ aaa aaa aaa aaa -acF aaa -acF aaa aaa aaa @@ -113991,7 +113857,37 @@ aaa aaa aaa aaa +bkt +bJP +brw +bpm +bmo +bmo +uDR +bpm +bmo +bmo +bpm +bmo +bmo +bpm +bmo aaa +bNM +bRt +bXI +bTL +bXI +bXO +bNM +bkt +eHx +orz +oMO +bpu +bms +bms +bms aaa aaa aaa @@ -114039,7 +113935,9 @@ aaa aaa aaa aaa +acF aaa +acF aaa aaa aaa @@ -114052,8 +113950,6 @@ aaa aaa aaa aaa -"} -(38,1,1) = {" aaa aaa aaa @@ -114115,6 +114011,10 @@ aaa aaa aaa aaa +"} +(38,1,1) = {" +aaa +aaa aaa aaa aaa @@ -114169,18 +114069,6 @@ aaa aaa aaa aaa -fPS -bLU -bLM -bPC -bmq -bTS -bpq -brq -oMO -bpu -oMO -abj aaa aaa aaa @@ -114226,6 +114114,32 @@ aaa aaa aaa aaa +bku +bJY +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +bJX +brs +bNM +bPN +czz +blG +bmS +bXP +bNM +bkt +bJP +brr aaa aaa aaa @@ -114233,9 +114147,7 @@ aaa aaa aaa aaa -abj aaa -abj aaa aaa aaa @@ -114280,7 +114192,9 @@ aaa aaa aaa aaa +abj aaa +abj aaa aaa aaa @@ -114309,8 +114223,6 @@ aaa aaa aaa aaa -"} -(39,1,1) = {" aaa aaa aaa @@ -114356,6 +114268,8 @@ aaa aaa aaa aaa +"} +(39,1,1) = {" aaa aaa aaa @@ -114426,14 +114340,6 @@ aaa aaa aaa aaa -bku -bLV -brr -bku -bRL -bTQ -bmY -brr aaa aaa aaa @@ -114465,6 +114371,32 @@ aaa aaa aaa aaa +abj +bpu +oMO +bms +bms +bms +bms +bms +bms +bms +bms +bms +bpu +fPS +bJP +bLR +bNM +bNM +bNM +bTM +bNM +bNM +bNM +bku +bJP +brs aaa aaa aaa @@ -114489,11 +114421,7 @@ aaa aaa aaa aaa -abj -abj aaa -abj -abj aaa aaa aaa @@ -114520,7 +114448,11 @@ aaa aaa aaa aaa +abj +abj aaa +abj +abj aaa aaa aaa @@ -114566,8 +114498,6 @@ aaa aaa aaa aaa -"} -(40,1,1) = {" aaa aaa aaa @@ -114595,6 +114525,15 @@ aaa aaa aaa aaa +"} +(40,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114684,13 +114623,7 @@ aaa aaa aaa aaa -bUJ aaa -bku -bmq -bTR -bpq -brr aaa aaa aaa @@ -114708,6 +114641,32 @@ aaa aaa aaa aaa +bku +bJP +bLS +wdm +bPR +bRJ +bTN +bVV +brw +bmo +bnM +bJP +brs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114939,19 +114898,19 @@ aaa aaa aaa aaa -aaa -aaa -bUJ -aaa -bku -bmq -bTS -bpq -brr -aaa -aaa -aaa -aaa +bkt +bJY +bLT +chS +chS +bVW +bTO +bVW +chS +chS +chS +cpe +brs aaa aaa aaa @@ -115197,18 +115156,18 @@ aaa aaa aaa aaa -aaa -bUJ +fPS +bLU +bLM +bPC +bmq +bTS +bpq +brq +oMO +bpu +oMO abj -bPS -bRM -bTT -bVX -bPS -aaa -aaa -aaa -aaa aaa aaa aaa @@ -115454,13 +115413,13 @@ aaa aaa aaa aaa -aaa -bUJ -aaa bku -bRN -bTU -bVY +bLV +brr +bku +bRL +bTQ +bmY brr aaa aaa @@ -115714,11 +115673,11 @@ aaa aaa bUJ aaa -bPU -bms -bZw -bms -bXR +bku +bmq +bTR +bpq +brr aaa aaa aaa @@ -115925,7 +115884,7 @@ aaa aaa aaa aaa -aaa +aaZ aaa aaa aaa @@ -115970,12 +115929,12 @@ aaa aaa aaa bUJ -abj -bPV -abj -chw -abj -bPV +aaa +bku +bmq +bTS +bpq +brr aaa aaa aaa @@ -116227,12 +116186,12 @@ aaa aaa aaa bUJ -aaa -bPW -wXe -chw -wXe -bXS +abj +bPS +bRM +bTT +bVX +bPS aaa aaa aaa @@ -116485,11 +116444,11 @@ aaa aaa bUJ aaa -abj -bRQ -chw -bWb -abj +bku +bRN +bTU +bVY +brr aaa aaa aaa @@ -116696,7 +116655,7 @@ aaa aaa aaa aaa -aaZ +aaa aaa aaa aaa @@ -116742,11 +116701,11 @@ aaa aaa bUJ aaa -abj -wXe -cnH -wXe -abj +bPU +bms +bZw +bms +bXR aaa aaa aaa @@ -116997,13 +116956,13 @@ aaa aaa aaa aaa -bVf -bXG -bYl +bUJ abj -coi +bPV abj +chw abj +bPV aaa aaa aaa @@ -117254,13 +117213,13 @@ aaa aaa aaa aaa -abj -aaa bUJ aaa -csr -aaa -abj +bPW +wXe +chw +wXe +bXS aaa aaa aaa @@ -117511,12 +117470,12 @@ aaa aaa aaa aaa -abj -aaa bUJ aaa -csr -aaa +abj +bRQ +chw +bWb abj aaa aaa @@ -117768,12 +117727,12 @@ aaa aaa aaa aaa -abj -abj bUJ +aaa abj -coi -abj +wXe +cnH +wXe abj aaa aaa @@ -117796,7 +117755,7 @@ aaa aaa aaa aaa -aaZ +aaa aaa aaa aaa @@ -117969,6 +117928,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -118024,10 +117984,9 @@ aaa aaa aaa aaa -aaa -abj -aaa -bUJ +aJU +aMK +bYl aaa csr aaa @@ -118345,15 +118304,9 @@ aaa aaa aaa aaa -abj -aaa -abj -aaa -aaa -aaa -aaa -aaa +abj aaa +abj aaa aaa aaa @@ -118421,15 +118374,14 @@ aaa aaa aaa aaa -"} -(55,1,1) = {" -aaa aaa aaa aaa aaa aaa aaa +"} +(55,1,1) = {" aaa aaa aaa @@ -118496,6 +118448,13 @@ aaa aaa aaa aaa +tQK +abj +tQK +abj +tQK +tQK +tQK aaa aaa aaa @@ -118740,23 +118699,23 @@ aaa aaa aaa aaa -aaZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa +tQK +tQK +aGW +tQK +tQK aaa +abj aaa +abj aaa +tQK +tQK +abj +tQK +tQK aaa aaa aaa @@ -118999,21 +118958,21 @@ aaa aaa aaa aaa +tQK aaa +abj aaa +abj aaa +ash +asV +atY aaa +abj aaa +abj aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tQK aaa aaa aaa @@ -119256,21 +119215,21 @@ aaa aaa aaa aaa +tQK aaa +ash +asV +atY aaa +ash +ata +atY aaa +ash +asV +atY aaa -dij abj -dij -abj -dij -dij -dij -aaa -aaa -aaa -aaa aaa aaa aaa @@ -119513,21 +119472,21 @@ aaa aaa aaa aaa -dij -dij -aGW -dij -dij -aaa abj aaa -abj +ash +ata +atY aaa -dij -dij -abj -dij -dij +ash +ata +atY +aaa +ash +ata +atY +aaa +tQK aaa aaa aaa @@ -119770,21 +119729,21 @@ aaa aaa aaa aaa -dij -aaa +tQK abj -aaa +ash +ata +atY abj -aaa ash -asV +ata atY -aaa abj -aaa +ash +ata +atY abj -aaa -dij +tQK aaa aaa aaa @@ -120027,10 +119986,10 @@ aaa aaa aaa aaa -dij +tQK aaa ash -asV +ata atY aaa ash @@ -120038,7 +119997,7 @@ ata atY aaa ash -asV +ata atY aaa abj @@ -120082,7 +120041,7 @@ aaa aaa aaa aaa -aaa +abj bUJ abj coi @@ -120281,24 +120240,24 @@ aaa aaa aaa aaa -aaa -aaa -aaa +tQK abj +tQK +tQK aaa ash ata atY aaa -ash -ata -atY +abj +atb +abj aaa ash ata atY aaa -dij +abj aaa aaa aaa @@ -120338,7 +120297,7 @@ aaa aaa aaa aaa -dij +tQK abj bUJ aaa @@ -120538,24 +120497,24 @@ aaa aaa aaa aaa +tQK aaa -aaa -aaa -dij abj -ash -ata -atY abj -ash -ata -atY abj -ash -ata -atY abj -dij +atb +abj +abj +abj +atZ +abj +abj +abj +atb +abj +abj +abj aaa aaa aaa @@ -120595,7 +120554,7 @@ abj acF acF acF -dij +tQK aaa bUJ aaa @@ -120795,29 +120754,29 @@ aaa aaa aaa aaa -aaa -aaa -aaa -dij -aaa -ash -ata -atY -aaa -ash -ata -atY -aaa -ash -ata -atY -aaa +tQK abj -aaa -aaa -aaa -aaa -aaa +apF +aEc +aEc +aEc +atc +atZ +atZ +atZ +atZ +atZ +atZ +atZ +atZ +aEb +aEc +aEc +aEc +atc +atZ +atZ +atZ aaa aaa aaa @@ -121052,29 +121011,29 @@ aaa aaa aaa aaa -dij -abj -dij -dij -aaa -ash -ata -atY +tQK aaa abj -atb abj -aaa -ash -ata -atY -aaa abj -aaa -aaa -aaa -aaa -aaa +abj +atK +abj +abj +abj +atZ +abj +abj +abj +atK +abj +abj +abj +abj +abj +abj +abj +mxG aaa aaa aaa @@ -121109,7 +121068,7 @@ bzE bzE bwN acF -dij +tQK aaa bUJ aaa @@ -121309,29 +121268,29 @@ aaa aaa aaa aaa -dij -aaa -abj -abj -abj -abj -atb -abj -abj -abj -atZ -abj -abj +tQK +tQK abj -atb abj +aaa +ash +atL +atY +aaa abj +atK abj aaa +ash +atL +atY aaa +abj aaa +abj aaa aaa +atZ aaa aaa aaa @@ -121366,7 +121325,7 @@ bEG bGB bwN abj -dij +tQK aaa bUJ aaa @@ -121566,28 +121525,28 @@ aaa aaa aaa aaa -dij +aaa +aaa +aaa +tQK +aaa +ash +atL +atY +aaa +ash +atL +atY +aaa +ash +atL +atY +aaa +tQK +aaa abj -apF -aEc -aEc -aEc -atc -atZ -atZ -atZ -atZ -atZ -atZ -atZ -atZ -aEb -aEc -aEc -aEc -atc -atZ -atZ +aaa +aaa atZ abj acF @@ -121823,30 +121782,30 @@ aaa aaa aaa aaa -dij aaa +aaa +aaa +tQK +aaa +ash +atL +atY abj +ash +atL +atY abj +ash +atL +atY +dKA +tQK abj abj -atK -abj -abj -abj +aaa +aaa atZ abj -abj -abj -atK -abj -abj -abj -abj -abj -abj -abj -atK -abj aLT aNT aPk @@ -121880,7 +121839,7 @@ bBi bzE bwN abj -dij +tQK aaa bUJ aaa @@ -122080,24 +122039,24 @@ aaa aaa aaa aaa -dij -dij -abj -abj +aaa +aaa +aaa +tQK aaa ash atL atY aaa -abj -atK -abj +ash +atL +atY aaa ash atL atY aaa -abj +tQK aaa abj abj @@ -122340,10 +122299,10 @@ aaa aaa aaa aaa -dij +abj aaa ash -atL +atU atY aaa ash @@ -122351,10 +122310,10 @@ atL atY aaa ash -atL +atU atY aaa -dij +abj aaa abj abj @@ -122593,25 +122552,25 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa +tQK aaa -dij +abj aaa -ash -atL -atY abj +aaa ash -atL +atU atY +aaa abj -ash -atL -atY -dKA -dij +aaa +abj +aaa +tQK abj abj aGX @@ -122854,23 +122813,23 @@ aaa aaa aaa aaa -dij -aaa -ash -atL -atY -aaa -ash -atL -atY +tQK +tQK +aGW +tQK +abj aaa -ash -atL -atY +abj aaa -dij +abj aaa abj +tQK +aGW +tQK +tQK +abj +aaa aGY aIq upI @@ -123101,6 +123060,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -123111,23 +123071,22 @@ aaa aaa aaa aaa -abj -aaa -ash -atU -atY -aaa -ash -atL -atY aaa -ash -atU -atY aaa +tQK +tQK +tQK +tQK +tQK +tQK +tQK +tQK +tQK +abj +abj abj -aaa abj +aaa aGY aIr aJI @@ -123364,27 +123323,27 @@ aaa aaa aaa aaa -aaZ aaa aaa aaa -dij aaa -abj aaa -abj aaa -ash -atU -atY aaa -abj aaa -abj aaa -dij -abj -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aGY aIs aJM @@ -123625,22 +123584,22 @@ aaa aaa aaa aaa -dij -dij -aGW -dij -abj aaa -abj aaa -abj aaa -abj -dij -aGW -dij -dij -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aGY aGY @@ -123872,7 +123831,6 @@ aaa aaa aaa aaa -aaZ aaa aaa aaa @@ -123885,20 +123843,21 @@ aaa aaa aaa aaa -dij -dij -dij -dij -dij -dij -dij -dij -dij -abj -abj -abj -abj aaa +aaa +aaa +aaa +aaa +aaa +aAe +aBV +aAe +aBV +aAe +aBV +aAe +aJy +aBV leZ aIt aMO @@ -124144,18 +124103,18 @@ aaa aaa aaa aaa -aaa -abj -aaa -abj -aaa -aaa -abj -aaa -aaa +tQK aaa aaa -acF +aAi +ayG +azR +ayG +aAi +ayG +azR +aIT +aEa aHa aIu aJN @@ -124401,18 +124360,18 @@ aaa aaa aaa aaa -dij -abj -abj -abj -abj -abj abj abj aaa -abj -abj -abj +aAi +aAi +aAi +aAi +aAi +aAi +aAi +aDC +aBV leZ aIv aJO @@ -124660,22 +124619,22 @@ aaa abj abj abj -aaa -aAe -aBV -aAe -aBV -aAe -aBV -aAe -aJy -aBV +abj +aAi +ayG +ayG +ayG +aAi +ayG +ayG +aIT +aEa leZ aIw aJO aLf aMG -aOb +aOg aOb aOb aOg @@ -124914,20 +124873,20 @@ aaa aaa aaa aaa -dij -abj +tQK abj abj +aaa aAi -ayG -azR -ayG -aAi -ayG -azR -aIT +vOo aEa -leZ +aDC +aEa +aDC +aEa +aDC +aBV +aHa aIx aJO eQe @@ -125171,20 +125130,20 @@ aaa aaa aaa aaa -dij -abj -abj -aaa -aAi -aAi -aAi -aAi -aAi -aAi -aAi -aDC -aBV -aHa +tQK +atd +atd +atd +fjw +eKj +eKj +atd +atd +eKj +eKj +eKj +bmf +leZ aIy gJL pNz @@ -125428,20 +125387,20 @@ aaa aaa aaa aaa -dij -abj -abj -abj -aAi -ayG -ayG -ayG -aAi -ayG -ayG -aIT -aEa -aHa +tQK +atd +wQE +qdE +lWo +aIH +aIH +axI +uYk +aEf +aEf +tEe +pJf +leZ aIz aJR hgs @@ -125684,23 +125643,23 @@ aaa aaa aaa aaa +aaa abj -abj -abj -abj -abj -aAi -aDC -aEa -aDC -aEa -aDC -aEa -aDC -aBV +atd +uJs +uQW +aDe +uQW +oKV +tUw +ePt +jqX +aFd +uQW +aCd leZ aIA -aJR +aEd hLA pih izz @@ -125937,30 +125896,30 @@ aaa aaa aaa aaa -dij -dij -abj -dij -dij +aaa +aaa +aaa +aaa +tQK abj atd -atd -eKj -aCd -eKj -eKj -atd -atd -eKj -eKj -eKj +avx +uQW +aDe +uQW +hZW +wwE +kuJ +aDe +aDe +uQW aCd -atd leZ -aJS -hgs -jhJ -aOb +leZ +leZ +vHD +aMJ +aOg kXZ aQW aSE @@ -125997,7 +125956,7 @@ bOe bUl bRZ bUl -bIq +syc bXU fEo cbi @@ -126061,36 +126020,36 @@ abj aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -dij -dij -dij -abj -sso -dij -dij +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +tQK +tQK +tQK +abj +sso +tQK +tQK aaa aaa aaa @@ -126194,31 +126153,31 @@ aaa aaa aaa aaa -abj aaa -abj +aaa aaa abj abj -atd -avx -uQW -ePt -kur +abj +axl +ker +awI +tep +ayJ kur -wwE -kuJ -vJN -xiD -rAC +aEm +age +mTu +tYw +aCi gba aGd -leZ -aJU -uNZ -aMK +aAg +lZR +aLs +aML aOg -aPy +aQZ aQT wpy bMF @@ -126337,21 +126296,21 @@ aaa aaa aaa aaa -dij +tQK abj abj -dij -dij +tQK +tQK aaa aaa abj aaa aaa -dij -dij +tQK +tQK sso -dij -dij +tQK +tQK aaa aaa aaa @@ -126450,33 +126409,33 @@ aaa aaa aaa aaa -dij -abj -abj -atd -pAQ -tEe -mPO -atd -aLs -aFd -axI -aFd -ayT -aCi -aCi -aDe -aFd -aFd +aaa +aaa +aaa +aaa +tQK +aaa +aaa +axl +avI +oql +axJ +aCp +ayV +aHc +aCS +uly +uNZ +nbG sQZ aJF -leZ -leZ -vHD -aMJ -aOg -aPz -aQT +aID +kAG +aLu +aMM +aOj +aUM +aDh aSD uQB aVF @@ -126594,7 +126553,7 @@ aaa aaa aaa aaa -dij +tQK aaa aaa abj @@ -126608,7 +126567,7 @@ aaa abj aaa aaa -dij +tQK aaa aaa aaa @@ -126707,32 +126666,32 @@ aaa aaa aaa aaa -dij -abj -atd -atd -qWG -tCX -hGx +aaa +aaa +aaa +aaa +raB +aaa +aaa axl avI -awI -axK -ayJ -azU -ayR -aAg -aCV -aEd +awP +axL +ayL +azT +qEN +azT +ayP +aFl ayR -iyC +aFe aJH -aIB -lZR -aLs -aML +aID +aCk +ocA +tzp aOg -aQZ +mMM aQT aSD oQJ @@ -126851,7 +126810,7 @@ aaa aaa aaa aaa -dij +tQK aaa dTV dYL @@ -126964,33 +126923,33 @@ aaa aaa aaa aaa -raB aaa -eKj -tUw -pJf -rwj -pJf -axl -avI -oql -axJ -aCp -ayV -aCS -aCS -aDh +aaa +aaa +aaa +tQK +abj +aaa +auG +avC +fCZ +nWY +ayM +aAd +aAa +aAd +raH aFl -aHc -uly -fhC -aID -kAG -aLu -aMM -aOj -aUM -aHG +fNS +aFf +aHl +fXC +atd +aLp +atd +aOg +aPC +aQT aSD qYd aVJ @@ -127122,8 +127081,7 @@ dTV dYM dVn aaa -dij -aaa +tQK aaa aaa aaa @@ -127152,6 +127110,7 @@ aaa aaa aaa aaa +rkU aaa aaa aaa @@ -127221,32 +127180,32 @@ aaa aaa aaa aaa -raB aaa -uUh -lWo -nIM -qEN -pJf -axl -avI -iVF -axL -ayL -azT -azT -azT -ayP -aCj -aDf -aFe +aaa +aaa +aaa +tQK +abj +abj +atd +aLu +qhe +iGO +ayM +pyQ +uBp +sqD +ksd +ayM +aFg +wBz aHh -aID -aCk -ocA -tzp +fXC +atd +wgY +eMw aOg -mMM +noD aQT aSD qYd @@ -127379,7 +127338,11 @@ dTV dYM dVn abj -dij +tQK +aaa +aaa +aaa +aaa aaa aaa aaa @@ -127404,6 +127367,7 @@ aaa aaa aaa aaa +hwq aaa aaa aaa @@ -127411,13 +127375,13 @@ aaa aaa aaa aaa +"} +(90,1,1) = {" aaa aaa aaa aaa aaa -"} -(90,1,1) = {" aaa aaa aaa @@ -127477,33 +127441,28 @@ aaa aaa aaa aaa +abj aaa -dij aaa -ths -kaO -pJf -uoQ -dFi -auG -avC -fCZ -axM -ayM -aAd -aAd -aAd -raH -aCj -aEf -aFf +lqL +awP +awP +bmJ +ayO +azZ +azZ +azZ +gLW +upc +pcM +aJs aHl -aIE -atd -aLp -atd -aOg -aPC +gdE +aJV +lSE +xCp +gML +ihk aQT aSD qYd @@ -127622,7 +127581,7 @@ aaa aaa aaa aaa -dij +tQK aaa dTV dYM @@ -127664,17 +127623,21 @@ aaa aaa aaa aaa +rkU +dTB +rkU aaa aaa aaa aaa aaa aaa +"} +(91,1,1) = {" +aaa aaa aaa aaa -"} -(91,1,1) = {" aaa aaa aaa @@ -127735,33 +127698,29 @@ aaa aaa aaa aaa -dij abj -atd -atd -kqp -rwj -pJf -sdI -aLu -qhe -axO -ayM -pyQ -sqD -sqD -ksd -ayM -aFg -wBz -aHh -aIF -atd -wgY -eMw -aOg -noD -aQT +aaa +aaa +lqL +lNO +lNO +nUm +ayO +aAa +aBX +aAa +mxm +aAa +aCZ +rZo +aCj +hjH +aJZ +glw +sfh +aOm +aTT +aDh aSD qYd aVI @@ -127873,13 +127832,13 @@ aaa aaa aaa aaa -dij -dij +tQK +tQK aaa -dij -dij +tQK +tQK aaa -dij +tQK aaa dTV dYM @@ -127894,9 +127853,9 @@ dYM dVn aaa abj -dij -dij -dij +tQK +tQK +tQK aaa aaa aaa @@ -127920,18 +127879,22 @@ aaa aaa aaa aaa +hwq +dTB +hwq +dTB aaa aaa aaa aaa aaa aaa +"} +(92,1,1) = {" aaa aaa aaa aaa -"} -(92,1,1) = {" aaa aaa aaa @@ -127992,32 +127955,28 @@ aaa aaa aaa aaa -dij +abj aaa -eKj -syc -pJf -rwj -pJf -vOo -avE -eiU +aaa +lqL +awP +awP axP -ayM -azZ -azZ -azZ -gLW +ayO +aAb +aAb +aAb +duJ upc pcM -aJs +gwO aHl -aIG -aJV -lSE -xCp -gML -ihk +iZL +lZR +stW +hiq +aOk +aQZ aQT aSD qYd @@ -128130,7 +128089,7 @@ aaa abj abj abj -dij +tQK abj abj abj @@ -128153,9 +128112,7 @@ aaa aaa abj aaa -dij -aaa -aaa +tQK aaa aaa aaa @@ -128179,16 +128136,21 @@ aaa aaa aaa aaa +rkU +dTB +rkU +rkU +rkU aaa aaa aaa aaa aaa +"} +(93,1,1) = {" aaa aaa aaa -"} -(93,1,1) = {" aaa aaa aaa @@ -128249,32 +128211,29 @@ aaa aaa aaa aaa -raB aaa -uUh -nUR -nIM -oKV -nIM -lqL -fjw -lNO -nUm -ayO -aAa -aBX -aAa -mxm -aAa -aCZ -rZo +tQK +abj +abj +atd +aLs +hwu +axS +ayM +oHg +qEB +qEB +nDt +ayM +ayM +oVs aGi -aIH -aJZ -glw -sfh -aOm -aTT +aID +atd +jMo +rbo +aOg +aPG jhG aSH cwX @@ -128387,7 +128346,7 @@ abj acF aaa aaa -dij +tQK abj aaa dQB @@ -128435,8 +128394,8 @@ aaa aaa aaa aaa -aaa -aaa +rkU +dTB aaa aaa aaa @@ -128506,32 +128465,32 @@ aaa aaa aaa aaa -dij aaa -ths -kaO -pJf -rwj -pJf -uJs -awP -fzx -axR +aaa +aaa +aaa +raB +abj +aaa +auG +avC +fCZ +axN ayM -aAb -aAb -aAb -duJ -upc -pcM -gwO -wQE -iZL -lZR -stW -hiq -aOk -aQZ +aAd +aAd +aAd +raH +axW +bVf +aGa +aHl +rme +atd +atd +atd +aOg +dVX aQT aSD aUe @@ -128667,7 +128626,7 @@ aaa aaa abj aaa -dij +tQK aaa aaa aaa @@ -128763,32 +128722,32 @@ aaa aaa aaa aaa -dij -abj -atd -atd -kqp -rwj -pJf -dFZ -iqR -hwu -axS -ayM -oHg -qEB -qEB -nDt -ayM -ayM -oVs -aHh -eEd -atd -jMo -rbo +aaa +aaa +aaa +aaa +sso +aaa +aaa +axl +avI +awP +fhC +ayP +aBf +aBf +aBf +ayL +axW +bVf +aFi +aHm +ycN +aJY +aLv +kNF aOg -aPG +sQf aQT aSD aTZ @@ -128901,13 +128860,13 @@ abj acF aaa aaa -dij +tQK abj aaa dYI aaa aaa -dij +tQK aaa dTV dYO @@ -128922,9 +128881,9 @@ dYO dVn aaa abj -dij -dij -dij +tQK +tQK +tQK aaa aaa aaa @@ -129020,32 +128979,32 @@ aaa aaa aaa aaa -raB aaa -eKj -tUw -pJf -rwj -dFi -auG -dWj -hZW -axN -ayM -aAd -aAd -aAd -raH -aDc +aaa +aaa +aaa +tQK +aaa +aaa +axl +avI +uMY +qFY +azU +axK +rfH +rfH +pJw aEj -aGa -aHl -oan -atd -atd -atd +aEj +oAP +aiE +aVS +oox +aLw +pJP aOg -dVX +vRU aQT aSD aTZ @@ -129158,13 +129117,13 @@ aaa abj abj abj -dij +tQK abj aaa dYJ aaa aaa -dij +tQK aaa dTV dYO @@ -129277,32 +129236,32 @@ aaa aaa aaa aaa -dij aaa -uBp -lWo -vKK -bnK -pJf +aaa +aaa +aaa +tQK +aaa +aaa axl -che -cJs -axL -ayP -aBf -aBf -aBf -ayL +avI +pYc +ewv +awP +fCZ +awP +fCZ +axP aDc -aEj -aFi -aHm -oeZ -aJY -aLv -kNF +axP +fCZ +kaO +ajx +kzE +nRx +oHK aOg -sQf +aQZ aQT aSJ aUf @@ -129410,9 +129369,9 @@ aaa abj aaa aaa -dij -dij -dij +tQK +tQK +tQK abj abj abj @@ -129421,7 +129380,7 @@ aaa dYJ abj aaa -dij +tQK abj dTV dYO @@ -129435,7 +129394,7 @@ dTV dYO dVn abj -dij +tQK aaa aaa aaa @@ -129534,32 +129493,32 @@ aaa aaa aaa aaa -dij aaa -ths +aaa +aaa +aaa tQK -pJf -rwj -pJf -axl -che -uMY -nbG -ayI -azV -aCU -aCU -aEe -aFV -aFV -dEE +aaa +aaa +atd +aLu +aJS +aDe +uQW +uQW +uQW +uQW +aDe +aDe +aDe +uQW hox -tep -oox -aLw -pJP +wzM +auK +nks +aes +aOl aOg -vRU aQT aSK aUg @@ -129678,7 +129637,7 @@ dPp pkj dPp abj -dij +tQK aaa dTV dYO @@ -129692,7 +129651,7 @@ dTV dYO dVn aaa -dij +tQK aaa aaa aaa @@ -129791,32 +129750,32 @@ aaa aaa aaa aaa -dij -abj +aaa +aaa +aaa +aaa +tQK +aaa +aaa atd atd -qWG -tYw -wqp -axl -che -pYc +aLu axV -ayR -aAg -ayR -aAg -aDd -aEm -aFj -rfH -mZv -aMM -kzE -nRx -oHK +ayK +azW +uQW +uQW +aEl +ygd +exZ +uQW +xzF +aID +atd +wAp +atd +aOg aOg -aQZ aQT aSL aUh @@ -129920,14 +129879,14 @@ abj abj abj abj -dij -dij -dij -dij -dij +tQK +tQK +tQK +tQK +tQK abj -dij -dij +tQK +tQK abj aaa abj @@ -129949,7 +129908,7 @@ dTV dYP dVn aaa -dij +tQK aaa aaa aaa @@ -130048,31 +130007,31 @@ aaa aaa aaa aaa -dij -abj +aaa +aaa +aaa +aaa +tQK +aaa +aaa aaa atd -pAQ -jqX -mPO atd -rfT -aCW bai -ayK -azW -aCW -aCW -aEl -ygd -exZ -aHp +hEn +gBo +waQ +pSJ +fpf +qOQ +vHB +aGc aJD gBF -auK -qaS -aes -aOl +atd +aaa +aaa +aaa aOg vMy aOg @@ -130206,7 +130165,7 @@ aaa abj aaa aaa -dij +tQK aaa aaa aaa @@ -130297,7 +130256,10 @@ aaa aaa aaa aaa -nhn +aaa +aaa +aaa +aaa aaa aaa aaa @@ -130307,29 +130269,26 @@ aaa aaa aaa abj -abj -abj -abj -abj +aaa +aaa +aaa aaa atd -eFV -qdk -axW -hEn -gBo -waQ -pSJ -fpf -qOQ -vHB -aGc -aJG atd +dLX +dLX +atd +aCk +iGI +ths +ths atd atd atd atd +aaa +aaa +aaa abj inh wRk @@ -130433,14 +130392,14 @@ abj abj abj abj -dij -dij -dij -dij +tQK +tQK +tQK +tQK abj -dij -dij -dij +tQK +tQK +tQK aaa abj aaa @@ -130451,8 +130410,8 @@ dRo dPq aaa aaa -dij -dij +tQK +tQK aaa aaa aaa @@ -130460,10 +130419,10 @@ abj aaa aaa sso -dij -dij +tQK +tQK sso -dij +tQK aaa aaa aaa @@ -130552,37 +130511,37 @@ aaa aaa aaa aaa -ndW -wlY -ebA -adb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa abj abj abj abj -aaa -fOs -fOs -abj -abj abj abj -atd -atd -atd -atd -dLX -dLX -atd -aCk -iGI -ths -ths -atd -atd -atd +aaa +aaa +aHG +aHG +aaa +aaa +aOW +aaa +aaa +aaa +aaa +aaa aaa abj biW @@ -130711,11 +130670,11 @@ aaa aaa sso aaa -dij -dij +tQK +tQK abj -dij -dij +tQK +tQK sso aaa aaa @@ -130809,19 +130768,19 @@ aaa aaa aaa aaa -acC -iWM -iWM -acC aaa aaa -abj aaa aaa -abj aaa -abj aaa +aaa +aaa +aaa +aaa +aaa +abj +abj abj aaa abj @@ -131064,18 +131023,18 @@ aaa aaa aaa aaa -adb -adb -adb -myI -myI -adb -acC -acC -adb -adb aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa apG apG @@ -131319,20 +131278,20 @@ aaa aaa aaa aaa -abj -abj -adb -oAP -krr -adZ -adZ -adZ -adZ -amz -aiE -adb -abj -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa apG aqv @@ -131576,20 +131535,20 @@ aaa aaa aaa aaa -abj aaa -acC -mxG -uks -uks -uks -uks -uYk -mTu -iWM -acC aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +uud +aaa +aaa +aaa +aaa aaa apG aqw @@ -131833,20 +131792,20 @@ aaa aaa aaa aaa -abj -abj -adb -onA -aeb -pJw -jhz -ufU -rJt -mTu -ajf -adb -abj -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +uud +aaa +aaa +aaa +aaa aaa apH aqx @@ -132090,20 +132049,20 @@ aaa aaa aaa aaa -abj aaa -adb -adb -acC -adb -adb -qdE -rJt -kJd -adb -adb aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +fZy +aaa +aaa +aaa +aaa aaa apG aqy @@ -132333,10 +132292,10 @@ aaa aaa aaa aaa +knM aaa aaa aaa -knM aaa aaa aaa @@ -132347,20 +132306,20 @@ aaa aaa aaa aaa -abj aaa aaa -abj aaa -abj -adb -afh -rJt -mTu -gWk -adb aaa -abj +nhn +aaa +aaa +aaa +aaa +uud +aaa +aaa +aaa +aaa aaa apH aqz @@ -132588,9 +132547,6 @@ aaa aaa aaa aaa -abj -abj -abj acC aef aef @@ -132609,14 +132565,17 @@ abj abj abj abj -abj -adb -afh -rJt -mTu -iWM +ndW +wlY +ebA adb -aaa +abj +abj +abj +xNL +abj +abj +abj abj aaa apH @@ -132845,13 +132804,13 @@ aaa aaa aaa abj -abj -aaa -aaa acC afb afb acC +aaa +aaa +aaa abj aaa aaa @@ -132864,15 +132823,15 @@ acC acC acC acC +iWM +iWM +acC +aaa +aaa +aaa +xNL aaa aaa -abj -adb -afh -rJt -mTu -tfE -adb aaa abj aaa @@ -133103,11 +133062,11 @@ adb acC adb acC -acC -acC -acC aef aef +acC +adb +adb adb acC acC @@ -133117,17 +133076,17 @@ acC acC acC aik -aiE nzd -ajf -acC +gWk +tfE acC +myI +myI acC +adb acC adb -afh -rJt -mTu +pYn adb adb adb @@ -133369,7 +133328,7 @@ afJ adZ adZ agd -age +aip adZ adZ adZ @@ -133380,11 +133339,11 @@ adZ adZ adZ aip -agA -agg -pOi -rJt -mTu +adZ +kJd +adZ +qdk +wQS amL bKz wSO @@ -133640,7 +133599,7 @@ szQ uks uks uks -vVB +nyB oCV gQF rUl @@ -133898,7 +133857,7 @@ aeb mFy aeb reW -amB +pOi amL ant anP @@ -143132,7 +143091,7 @@ aaa aaa aaa aaa -aaa +abj abj abj aaa @@ -143391,7 +143350,7 @@ aaa aaa aaa aaa -aaa +abj abj acC aip @@ -146987,13 +146946,13 @@ aaa aaa aaa aaa -dij -dij +tQK +tQK abj -dij -dij +tQK +tQK abj -dij +tQK aaa aaa aaa @@ -147240,20 +147199,20 @@ aaa aaa aaa aaa -dij -dij +tQK +tQK abj -dij -dij +tQK +tQK dKz aaa abj aaa aaa -dij -dij +tQK +tQK aGW -dij +tQK abj adg abj @@ -147497,7 +147456,7 @@ aaa aaa aaa aaa -dij +tQK aaa aaa abj @@ -148011,7 +147970,7 @@ aaa aaa aaa aaa -dij +tQK aaa ace acg @@ -148268,7 +148227,7 @@ aaa aaa aaa aaa -dij +tQK abj ace acg @@ -148779,10 +148738,10 @@ aaa aaa aaa aaa -dij +tQK aGW -dij -dij +tQK +tQK abj ace acg @@ -149036,7 +148995,7 @@ aaa aaa aaa aaa -dij +tQK aaa abj aaa @@ -149550,7 +149509,7 @@ aaa aaa aaa aaa -dij +tQK aaa abj aaa @@ -149807,10 +149766,10 @@ aaa aaa aaa aaa -dij -dij -dij -dij +tQK +tQK +tQK +tQK abj ace aco @@ -149824,7 +149783,7 @@ ace aco acG abj -dij +tQK aaa aaa aaa @@ -150067,7 +150026,7 @@ aaa aaa aaa aaa -dij +tQK aaa ace aco @@ -150081,7 +150040,7 @@ ace aco acG aaa -dij +tQK aaa aaa aaa @@ -150338,7 +150297,7 @@ ace aco acG abj -dij +tQK aaa aaa aaa @@ -150581,7 +150540,7 @@ aaa aaa aaa aaa -dij +tQK aaa ace aco @@ -150595,7 +150554,7 @@ ace aco acG aaa -dij +tQK aaa aaa aaa @@ -150838,7 +150797,7 @@ aaa aaa aaa aaa -dij +tQK aaa ace acE @@ -151095,7 +151054,7 @@ aaa aaa aaa aaa -dij +tQK aaa aaa abj @@ -151109,7 +151068,7 @@ aaa abj aaa dKz -dij +tQK aaa aaa aaa @@ -151352,21 +151311,21 @@ aaa aaa aaa aaa -dij -dij +tQK +tQK abj -dij -dij +tQK +tQK aaa aaa abj aaa aaa -dij -dij +tQK +tQK abj -dij -dij +tQK +tQK aaa aaa aaa @@ -151613,13 +151572,13 @@ aaa aaa aaa aaa -dij -dij +tQK +tQK abj -dij -dij +tQK +tQK abj -dij +tQK aaa aaa aaa @@ -153455,7 +153414,7 @@ abj aaa abj abj -oEG +uEC aaa aaa aaa @@ -153712,7 +153671,7 @@ aaa aaa aaa aaa -oEG +uEC abj abj aaa @@ -155387,11 +155346,11 @@ bgs bgs abj aaa -dij -dij +tQK +tQK abj -dij -dij +tQK +tQK aaa aaa aaa @@ -155905,7 +155864,7 @@ abj aaa abj aaa -dij +tQK aaa aaa aaa @@ -156162,7 +156121,7 @@ abj abj aSC abj -dij +tQK abj aaa aaa @@ -156677,7 +156636,7 @@ dak jzK dbc abj -dij +tQK aaa aaa aaa @@ -157192,8 +157151,8 @@ jzK dbc abj abj -dij -dij +tQK +tQK abj dij dij @@ -157457,7 +157416,7 @@ abj aaa abj aaa -dij +tQK abj abj aaa @@ -157716,7 +157675,7 @@ abj aaa aaa aaa -dij +tQK aaa aaa aaa @@ -157973,7 +157932,7 @@ cTN aaa aaa aaa -dij +tQK aaa aaa aaa @@ -158230,7 +158189,7 @@ cTN cTN abj abj -dij +tQK aaa aaa aaa @@ -158489,7 +158448,7 @@ cTN aaa abj abj -dij +tQK aaa aaa aaa @@ -159003,7 +158962,7 @@ cTN aaa abj aaa -dij +tQK aaa aaa aaa @@ -159260,7 +159219,7 @@ cTN ewF rnO abj -dij +tQK aaa aaa aaa @@ -159372,12 +159331,12 @@ aaa aaa aaa aaa -oEG +uEC abj abj abj -oEG -oEG +uEC +uEC abj rfd qBc @@ -159517,7 +159476,7 @@ cTN aaa abj aaa -dij +tQK aaa aaa aaa @@ -159629,7 +159588,7 @@ aaa aaa aaa aaa -oEG +uEC aaa aaa aaa @@ -159886,7 +159845,7 @@ aaa aaa aaa aaa -oEG +uEC aaa aaa aaa @@ -160029,8 +159988,8 @@ abj cTN cTN aaa -dij -dij +tQK +tQK abj aaa aaa @@ -160269,7 +160228,7 @@ aaa aaa aaa aaa -dij +tQK abj abj cTN @@ -160400,7 +160359,7 @@ aaa aaa aaa aaa -oEG +uEC aaa aaa aaa @@ -160543,7 +160502,7 @@ cTN aaa aaa aaa -dij +tQK aaa aaa aaa @@ -160783,7 +160742,7 @@ aaa aaa aaa aaa -dij +tQK abj dak daT @@ -160800,7 +160759,7 @@ abj aaa aaa aaa -dij +tQK aaa aaa aaa @@ -160914,7 +160873,7 @@ aaa aaa aaa aaa -oEG +uEC aaa aaa aaa @@ -161054,8 +161013,8 @@ aaa abj aaa abj -aaa -dij +rkU +tQK abj abj aaa @@ -161171,7 +161130,7 @@ aaa aaa aaa aaa -oEG +uEC aaa aaa aaa @@ -161297,20 +161256,20 @@ aaa aaa aaa aaa -dij +tQK abj dak daT dbc abj -dij -dij -dij -dij -dij -dij +tQK +tQK +tQK +tQK +tQK +tQK abj -dij +tQK abj abj aaa @@ -161428,7 +161387,7 @@ aaa aaa aaa aaa -oEG +uEC aaa aaa aaa @@ -161554,13 +161513,13 @@ aaa aaa aaa aaa -dij +tQK aaa dak daT dbc aaa -dij +tQK aaa aaa aaa @@ -161811,7 +161770,7 @@ aaa aaa aaa aaa -dij +tQK abj dak daT @@ -161944,8 +161903,8 @@ aaa aaa abj abj -oEG -oEG +uEC +uEC abj abj vrw @@ -162074,7 +162033,7 @@ aaa jtN aaa aaa -dij +tQK aaa aaa aaa @@ -162325,7 +162284,7 @@ aaa aaa aaa aaa -dij +tQK abj abj cQb @@ -162582,13 +162541,13 @@ aaa aaa aaa aaa -dij +tQK abj aaa abj aaa abj -dij +tQK aaa aaa aaa @@ -162841,9 +162800,9 @@ aaa aaa aaa abj -dij -dij -dij +tQK +tQK +tQK abj aaa aaa diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index d3a208a234b1..3d91236c179c 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -66,6 +66,7 @@ #include "radio_sound/radio_sound.dme" #include "screentip_change/_screentip_change.dme" #include "smart_equip_targeted/_smart_equip_targeted.dme" +#include "sm_space_drop/sm_space_drop.dme" #include "text_to_speech/_tts.dme" #include "title_screen/_title_screen.dme" #include "whitelist/_whitelist.dme" diff --git a/modular_ss220/sm_space_drop/code/paper_sm_info.dm b/modular_ss220/sm_space_drop/code/paper_sm_info.dm new file mode 100644 index 000000000000..d610bcd7fbea --- /dev/null +++ b/modular_ss220/sm_space_drop/code/paper_sm_info.dm @@ -0,0 +1,19 @@ +// Инструкция пользование системы сброса СМ + +/obj/item/paper/sm_paper + name = "Инструкция по использованию СБСКС" + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "paper" + info = {"
Инструкция по использованию Системы Быстрого Сброса Кристала Суперматерии
+ +
1. Ни при каких обстоятельствах не нажимать на кнопку ради проверки ее работоспособности.
+ +
2. Решение о сбросе кристала может принимать СЕ или его ВРиО и выше.
+ +
3. Если целостность кристала равна 10 или мение процентов, должне быть произведен сброс кристала в кратчайшее время.
+ +
4. В случае отсутствия СЕ и до назначения его ВРиО решение о сбросе кристала принимает Капитан.
+ +
5. Создание помехи при неообходимости сброса кристала квалифицируется статьей 400 космического закона.
+ +
Поздравляю! Теперь в случае вероятности взрыва кристала супер материи вы в состоянии сохранить целостность станции.
"} diff --git a/modular_ss220/sm_space_drop/code/sm_button.dm b/modular_ss220/sm_space_drop/code/sm_button.dm new file mode 100644 index 000000000000..48acd2fc384c --- /dev/null +++ b/modular_ss220/sm_space_drop/code/sm_button.dm @@ -0,0 +1,97 @@ + +////////////////////////////////////// +// SMDS Button // +////////////////////////////////////// + +/obj/machinery/sm_drop_controll_buttons + name = "SM Drop Controll" + desc = "Кнопка для экстренного выбраса СМ в космос" + icon = 'modular_ss220/sm_space_drop/icon/sm_buttons.dmi' + icon_state = "sm_button_off" + anchored = TRUE + armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, rad = 100, fire = 90, acid = 70) + idle_power_consumption = 2 + active_power_consumption = 4 + resistance_flags = LAVA_PROOF | FIRE_PROOF + /// ID tag of the driver to hook to + var/id_tag = "SpaceDropSM" + /// Are we active? + var/active = FALSE + /// Range of drivers + blast doors to hit + // Без этой залупы ошибки в оснвовном коде т.к. есть еше кнопки что использую эту залупу для ограничения действия что работает не коректно + var/range = 7 + +/obj/machinery/button/indestructible + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + +/obj/machinery/sm_drop_controll_buttons/Initialize(mapload, place_dir) + . = ..() + switch(place_dir) + if(NORTH) + pixel_y = 25 + if(SOUTH) + pixel_y = -25 + if(EAST) + pixel_x = 25 + if(WEST) + pixel_x = -25 + +/obj/machinery/sm_drop_controll_buttons/attack_ai(mob/user) + attack_hand(user) + +/obj/machinery/sm_drop_controll_buttons/attack_ghost(mob/user) + if(user.can_advanced_admin_interact()) + attack_hand(user) + +/obj/machinery/sm_drop_controll_buttons/attack_hand(mob/user) + if(stat & (NOPOWER|BROKEN)) + return + + if(active) + return + + add_fingerprint(user) + + use_power(5) + // ADD GREG + for(var/obj/machinery/atmospherics/supermatter_crystal/engine/M) + if(M.id_tag == id_tag) + M.anchored = FALSE + // ADD GREG + + // Start us off + launch_sequence() + + +/obj/machinery/sm_drop_controll_buttons/proc/launch_sequence() + active = TRUE + icon_state = "sm_button_on_animated" + // Time sequence + // OPEN DOORS + // Wait 2 seconds + // LAUNCH + // Wait 5 seconds + // CLOSE + // Then make not active + + for(var/obj/machinery/door/poddoor/M) + if(M.id_tag == id_tag && !M.protected) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door, open)) + // 2 seconds after previous invocation + + for(var/obj/machinery/sm_mass_driver/M) + if(M.id_tag == id_tag) + addtimer(CALLBACK(M, TYPE_PROC_REF(/obj/machinery/sm_mass_driver, drive)), 2 SECONDS) + + // We want this 5 seconds after open, so the delay is 7 seconds from this proc + + for(var/obj/machinery/door/poddoor/M) + if(M.id_tag == id_tag && !M.protected) + addtimer(CALLBACK(M, TYPE_PROC_REF(/obj/machinery/door, close)), 7 SECONDS) + + // And rearm us + addtimer(CALLBACK(src, PROC_REF(rearm)), 7 SECONDS) + +/obj/machinery/sm_drop_controll_buttons/proc/rearm() + icon_state = "sm_button_off" + active = FALSE diff --git a/modular_ss220/sm_space_drop/code/sm_mass_driver.dm b/modular_ss220/sm_space_drop/code/sm_mass_driver.dm new file mode 100644 index 000000000000..b3940ff763c1 --- /dev/null +++ b/modular_ss220/sm_space_drop/code/sm_mass_driver.dm @@ -0,0 +1,42 @@ +/obj/machinery/sm_mass_driver + name = "Пусковая установка СМ" + desc = "Запускает СМ бороздить просторы космоса." + icon = 'icons/obj/objects.dmi' + icon_state = "mass_driver" + anchored = TRUE + idle_power_consumption = 2 + active_power_consumption = 50 + // ADD GREG + resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + // ADD GREG + + /// Throw power + var/power = 1 + /// ID tag, used for buttons + var/id_tag = "SpaceDropSM" + /// This is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. + var/drive_range = 50 + +/obj/machinery/sm_mass_driver/proc/drive(amount) + if(stat & (BROKEN|NOPOWER)) + return + + use_power(500 * power) + var/O_limit = 0 + var/atom/target = get_edge_target_turf(src, dir) + for(var/atom/movable/O in loc) + if((!O.anchored && O.move_resist != INFINITY) || ismecha(O)) //Mechs need their launch platforms. Also checks if something is anchored or has move resist INFINITY, which should stop ghost flinging. + O_limit++ + + if(O_limit >= 20)//so no more than 20 items are sent at a time, probably for counter-lag purposes + break + + use_power(500) + var/coef = 1 + if(emagged) + coef = 5 + INVOKE_ASYNC(O, TYPE_PROC_REF(/atom/movable, throw_at), target, (drive_range * power * coef), (power * coef)) + + flick("mass_driver1", src) + +/obj/machinery/sm_mass_driver/multitool_act(mob/user, obj/item/I) diff --git a/modular_ss220/sm_space_drop/code/sm_space_drop.dm b/modular_ss220/sm_space_drop/code/sm_space_drop.dm new file mode 100644 index 000000000000..d6e5b79952ec --- /dev/null +++ b/modular_ss220/sm_space_drop/code/sm_space_drop.dm @@ -0,0 +1,4 @@ +/obj/machinery/atmospherics/supermatter_crystal/engine + is_main_engine = TRUE + anchored = TRUE + var/id_tag = "SpaceDropSM" diff --git a/modular_ss220/sm_space_drop/icon/sm_buttons.dmi b/modular_ss220/sm_space_drop/icon/sm_buttons.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5b1dac21c2b034362b9892a88d4249841076ac71 GIT binary patch literal 419 zcmV;U0bKrxP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a?DJ)I5Sc+(=$pSoZ^zil2jm5sW>-2skEddKQBH%Elr7wGbOXA7$|PY#hF%= zn41b=V^f_+lH&Npyv$sncnWr1K-ZOIg9y&jsuy0F|;pfZ`1z{Qv*} zkx4{BRA_&J6EAnQxqTYq`P1EwYJ*JpCT?G+E0-*LZxia$}( z>wofbRoMXm0002~jr~FW{$QMv1Csautv!AJ-`dkFW-Ao?0{{T1^92;^HV>lT8*2an N002ovPDHLkV1lC3uTTI0 literal 0 HcmV?d00001 diff --git a/modular_ss220/sm_space_drop/sm_space_drop.dm b/modular_ss220/sm_space_drop/sm_space_drop.dm new file mode 100644 index 000000000000..1789fd0f7161 --- /dev/null +++ b/modular_ss220/sm_space_drop/sm_space_drop.dm @@ -0,0 +1,16 @@ +/datum/modpack/sm_space_drop + /// A string name for the modpack. Used for looking up other modpacks in init. + name = "sm_space_drop" + /// A string desc for the modpack. Can be used for modpack verb list as description. + desc = "its useless" + /// A string with authors of this modpack. + author = "furior" + +/datum/modpack/sm_space_drop/pre_initialize() + . = ..() + +/datum/modpack/sm_space_drop/initialize() + . = ..() + +/datum/modpack/sm_space_drop/post_initialize() + . = ..() diff --git a/modular_ss220/sm_space_drop/sm_space_drop.dme b/modular_ss220/sm_space_drop/sm_space_drop.dme new file mode 100644 index 000000000000..a14759d1b3ed --- /dev/null +++ b/modular_ss220/sm_space_drop/sm_space_drop.dme @@ -0,0 +1,6 @@ +#include "sm_space_drop.dm" + +#include "code\sm_button.dm" +#include "code\sm_space_drop.dm" +#include "code\sm_mass_driver.dm" +#include "code\paper_sm_info.dm" From 134a93e5b5e5941fd844a6986c054717e6ba08c7 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 02:16:16 +0500 Subject: [PATCH 02/14] Fix_Merg_Conf --- _maps/map_files220/delta/delta.dmm | 7242 ++++++++--------- modular_ss220/sm_space_drop/code/sm_button.dm | 91 +- .../sm_space_drop/code/sm_mass_driver.dm | 32 +- .../sm_space_drop/icon/sm_buttons.dmi | Bin 419 -> 0 bytes .../sm_space_drop/icons/sm_buttons.dmi | Bin 0 -> 417 bytes modular_ss220/sm_space_drop/sm_space_drop.dm | 15 +- 6 files changed, 3570 insertions(+), 3810 deletions(-) delete mode 100644 modular_ss220/sm_space_drop/icon/sm_buttons.dmi create mode 100644 modular_ss220/sm_space_drop/icons/sm_buttons.dmi diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 818ec8f4c0f5..d18f3a9058af 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -543,7 +543,9 @@ "aeP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "aeQ" = ( @@ -763,7 +765,9 @@ /obj/structure/sign/vacuum{ pixel_y = 32 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -788,7 +792,7 @@ icon_state = "red" }, /area/station/security/checkpoint/south) -"agd" = ( +"age" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -798,12 +802,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) -"age" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plasteel{ - icon_state = "yellowcorner" - }, -/area/station/engineering/controlroom) "agg" = ( /obj/machinery/status_display/directional/west, /obj/machinery/light/directional/west, @@ -1126,26 +1124,13 @@ }, /area/station/hallway/secondary/entry) "aiE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) +/obj/machinery/economy/atm/east, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "aiF" = ( /obj/structure/chair{ dir = 8 @@ -1225,32 +1210,6 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) -"ajx" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ajy" = ( /obj/item/kirbyplants, /obj/effect/turf_decal/delivery, @@ -1375,7 +1334,9 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "ali" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -1557,7 +1518,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "amA" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -2544,7 +2507,9 @@ dir = 4; id = "garbage" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -2773,7 +2738,6 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/landmark/damageturf, -/obj/random/hampter, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "arw" = ( @@ -3243,7 +3207,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "asR" = ( @@ -3255,7 +3221,9 @@ /obj/machinery/door/poddoor/preopen{ id_tag = "innerdisposal" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -4028,17 +3996,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "avx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson, /obj/effect/turf_decal/delivery/hollow, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "avC" = ( @@ -4048,6 +4015,14 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"avE" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "avI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4190,7 +4165,9 @@ /area/station/maintenance/disposal) "awC" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/disposal) @@ -4254,11 +4231,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"awP" = ( -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "awV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4443,7 +4415,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "axz" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4550,22 +4524,12 @@ }, /area/station/hallway/secondary/entry) "axI" = ( -/obj/machinery/camera{ - c_tag = "Supermatter West"; - dir = 4; - network = list("Engineering","SS13"); - pixel_y = -22 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/dispenser, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axJ" = ( @@ -4579,20 +4543,26 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axK" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/structure/table/reinforced, +/obj/item/paper/sm_paper, +/obj/machinery/driver_button/sm_drop_button{ + pixel_y = -16; + pixel_x = 8; + range = 20 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/office/ce) +"axL" = ( +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"axL" = ( -/obj/machinery/light/directional/south, +"axM" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -4611,6 +4581,15 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"axO" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "axP" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -4632,20 +4611,15 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axV" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/atmospherics/trinary/filter{ + dir = 4; + filter_type = "o2"; + on = 1 }, -/obj/machinery/atmospherics/meter, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"axW" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/engineering/engine/supermatter) "axY" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -4793,23 +4767,26 @@ id = "garbage" }, /obj/machinery/recycler, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) -"ayJ" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "Gas to Loop" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +"ayI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ayK" = ( /obj/machinery/atmospherics/pipe/simple/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ayL" = ( @@ -4820,13 +4797,12 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "ayO" = ( -/obj/machinery/door/poddoor{ - id_tag = "SpaceDropSM"; - protected = 0; - name = "SM Drop Door" +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/station/engineering/engine/supermatter) +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ayP" = ( /obj/machinery/status_display{ name = "Дисплей статуса" @@ -4834,13 +4810,18 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "ayR" = ( -/obj/item/wrench, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) +"ayT" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Gas to Loop" }, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/engine/supermatter) +/area/station/engineering/controlroom) "ayV" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -5155,18 +5136,25 @@ }, /turf/simulated/floor/plating, /area/station/engineering/engine/supermatter) -"azU" = ( +"azV" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "azW" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "azZ" = ( @@ -5200,15 +5188,10 @@ /turf/space, /area/space/nearstation) "aAg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/item/radio/intercom/directional/west, -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular{ - pixel_y = 6 +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aAi" = ( /obj/structure/lattice/catwalk, @@ -5524,7 +5507,9 @@ /area/station/supply/storage) "aBQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -5556,12 +5541,13 @@ /turf/space, /area/space/nearstation) "aBX" = ( -/obj/machinery/sm_mass_driver{ - dir = 1 +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 }, -/obj/machinery/atmospherics/supermatter_crystal/engine, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aBY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance/two, @@ -5571,50 +5557,27 @@ /turf/simulated/floor/plasteel, /area/station/supply/sorting) "aCd" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 }, +/obj/effect/spawner/window/reinforced/plasma/grilled, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/station/engineering/controlroom) "aCi" = ( -/obj/machinery/atmospherics/trinary/filter{ - dir = 1; - filter_type = "n2"; - name = "nitrogen filter"; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aCj" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, +/obj/machinery/atmospherics/unary/portables_connector, +/obj/machinery/atmospherics/portable/scrubber, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aCk" = ( /obj/structure/sign/securearea, @@ -5762,6 +5725,38 @@ icon_state = "redfull" }, /area/station/security/brig) +"aCU" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aCV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aCW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aCZ" = ( /obj/machinery/door/airlock/atmos/glass{ heat_proof = 1; @@ -5778,26 +5773,40 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "aDc" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/atmospherics/unary/portables_connector, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aDd" = ( +/obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + icon_state = "neutralfull" }, /area/station/engineering/controlroom) "aDe" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/light/directional/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"aDh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +"aDf" = ( +/obj/item/wrench, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aDj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance/two, @@ -5895,7 +5904,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/space/nearstation) +/area/station/engineering/controlroom) "aEa" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -5920,37 +5929,24 @@ }, /turf/space, /area/station/maintenance/auxsolarport) -"aEd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) -"aEf" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ +"aEe" = ( +/obj/machinery/light/directional/west, +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/unary/thermomachine/freezer{ +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aEf" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aEg" = ( @@ -5964,18 +5960,8 @@ }, /area/station/maintenance/fore) "aEj" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, +/obj/machinery/atmospherics/binary/pump, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aEk" = ( @@ -5998,16 +5984,17 @@ dir = 8; name = "Nitrogen to Loop" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aEm" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/reflector/box{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "aEp" = ( @@ -6238,7 +6225,9 @@ /turf/space, /area/space) "aFd" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aFe" = ( @@ -6286,12 +6275,14 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"aFl" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/atmospherics/portable/scrubber, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/engineering/engine/supermatter) +"aFj" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "aFp" = ( /obj/machinery/light/directional/west, /obj/machinery/navbeacon{ @@ -6408,6 +6399,18 @@ /obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/station/supply/storage) +"aFV" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aGa" = ( /obj/machinery/atmospherics/meter, /obj/machinery/atmospherics/pipe/manifold/visible, @@ -6423,36 +6426,17 @@ /area/station/engineering/controlroom) "aGc" = ( /obj/machinery/power/apc/directional/east, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 + d2 = 8; + icon_state = "0-8" }, -/obj/item/kirbyplants, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aGd" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + d2 = 8; + icon_state = "1-8" }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aGe" = ( /obj/structure/table/glass, @@ -6481,17 +6465,22 @@ /area/station/supply/storage) "aGi" = ( /obj/machinery/hologram/holopad, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, +/obj/effect/turf_decal/delivery/hollow, /obj/structure/cable{ - d1 = 4; + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -6693,6 +6682,17 @@ icon_state = "neutralfull" }, /area/station/engineering/controlroom) +"aHp" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aHr" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "IAA" @@ -6731,12 +6731,15 @@ /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "aHG" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/space, -/area/space/nearstation) +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "aHI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -6999,14 +7002,13 @@ c_tag = "Turbine"; network = list("SS13","Engineering") }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIy" = ( -/obj/structure/sign/nosmoking_2{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/maintenance/turbine) +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "aIz" = ( /obj/machinery/power/terminal{ dir = 4 @@ -7015,45 +7017,47 @@ d2 = 2; icon_state = "0-2" }, -/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIA" = ( -/obj/machinery/power/smes{ - charge = 1e+006 - }, -/obj/structure/sign/electricshock{ - pixel_y = 32 +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/space/nearstation) +"aID" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aIE" = ( +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, -/obj/machinery/light/directional/north, -/turf/simulated/floor/plasteel/dark, -/area/station/maintenance/turbine) -"aID" = ( +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aIF" = ( +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"aIG" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aIH" = ( -/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/closet/firecloset, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aIQ" = ( @@ -7090,9 +7094,6 @@ dir = 6 }, /obj/item/kirbyplants, -/obj/structure/railing/cap/normal{ - dir = 4 - }, /turf/simulated/floor/wood/fancy, /area/station/service/theatre) "aIY" = ( @@ -7227,24 +7228,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/space, /area/space/nearstation) -"aJD" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/table/reinforced, -/obj/item/multitool, -/obj/item/multitool{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aJE" = ( /obj/machinery/conveyor/south{ id = "QMLoad2" @@ -7252,29 +7235,30 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "aJF" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aJG" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/small/directional/south, +/obj/item/multitool, +/obj/item/multitool{ + pixel_x = 4; + pixel_y = -4 }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aJH" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -7341,20 +7325,33 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aJS" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +/obj/machinery/light/directional/north, +/obj/machinery/power/apc/directional/north, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/maintenance/turbine) "aJU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "aJV" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -7572,7 +7569,9 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "aKK" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aKL" = ( @@ -7599,7 +7598,9 @@ /area/station/maintenance/auxsolarport) "aKZ" = ( /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) "aLb" = ( @@ -7881,26 +7882,25 @@ dir = 8; name = "Port to Turbine" }, -/obj/machinery/power/apc/directional/south, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aMJ" = ( -/obj/structure/sign/vacuum, -/turf/simulated/wall/r_wall, -/area/station/maintenance/turbine) -"aMK" = ( -/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/trinary/tvalve/digital{ + dir = 8 + }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aMK" = ( /turf/space, -/area/space) +/area/station/hallway/secondary/entry) "aML" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -8258,9 +8258,6 @@ /obj/structure/railing/corner{ dir = 8 }, -/obj/structure/railing/cap/normal{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8463,6 +8460,26 @@ icon_state = "neutralfull" }, /area/station/maintenance/turbine) +"aPy" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) +"aPz" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas, +/obj/item/radio/intercom/directional/north, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/station/engineering/atmos) "aPC" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -9046,22 +9063,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"aSH" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos) "aSI" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -9367,7 +9368,9 @@ dir = 4 }, /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) "aUt" = ( @@ -9756,36 +9759,6 @@ /obj/effect/spawner/window/reinforced/plasma/grilled, /turf/simulated/floor/plating, /area/station/engineering/atmos) -"aVS" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/economy/vending/wallmed/directional/south, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/machinery/economy/vending/wallmed/directional/south, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aVT" = ( /obj/machinery/atmospherics/portable/canister/air{ anchored = 1 @@ -9866,7 +9839,9 @@ }, /area/station/hallway/primary/fore) "aWu" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /mob/living/simple_animal/hostile/gorilla/cargo_domestic{ name = "Forklift" }, @@ -9874,7 +9849,9 @@ /area/station/supply/storage) "aWz" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aWA" = ( @@ -9925,7 +9902,9 @@ c_tag = "Cargo Dock South"; dir = 1 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aWH" = ( @@ -10713,14 +10692,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prisonlockers) "bai" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 }, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/power/emitter, /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 4 }, +/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "baj" = ( @@ -11751,11 +11729,15 @@ /area/station/security/warden) "beq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "ber" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "bes" = ( @@ -13251,7 +13233,9 @@ }, /area/station/engineering/atmos) "bkK" = ( -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "bkL" = ( @@ -13262,6 +13246,12 @@ icon_state = "neutralfull" }, /area/station/engineering/atmos) +"bkM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "bkN" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -13509,17 +13499,6 @@ }, /turf/simulated/floor/plating, /area/station/legal/courtroom) -"bmf" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/station/engineering/controlroom) "bmg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -13719,27 +13698,6 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"bmJ" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "bmL" = ( /obj/item/kirbyplants, /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -13925,6 +13883,15 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/bridge) +"bnK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "bnM" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -15727,7 +15694,9 @@ pixel_y = 3 }, /obj/item/circuitboard/card, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -16353,7 +16322,9 @@ }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -16662,7 +16633,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bAe" = ( @@ -17542,7 +17515,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bDp" = ( @@ -17973,7 +17948,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bEO" = ( -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bEQ" = ( @@ -18407,7 +18384,9 @@ /area/station/engineering/gravitygenerator) "bGv" = ( /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bGw" = ( @@ -21729,6 +21708,22 @@ }, /turf/space, /area/space/nearstation) +"bRr" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel/dark, +/area/station/aisat) +"bRs" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, +/turf/simulated/floor/plasteel/dark, +/area/station/aisat) "bRt" = ( /obj/machinery/computer/teleporter, /obj/effect/turf_decal/stripes/line{ @@ -21736,6 +21731,24 @@ }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) +"bRx" = ( +/obj/structure/showcase{ + density = 0; + dir = 4; + icon = 'icons/mob/robots.dmi'; + icon_state = "robot_old"; + name = "Cyborg Statue"; + pixel_x = -9; + pixel_y = 2 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/simulated/floor/plating, +/area/station/turret_protected/aisat) "bRz" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -22903,10 +22916,14 @@ }, /area/station/hallway/primary/central/east) "bVf" = ( -/obj/machinery/atmospherics/binary/pump, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/engineering/engine/supermatter) +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/space, +/area/space/nearstation) "bVj" = ( /obj/machinery/camera{ c_tag = "Minisat Teleporter Room"; @@ -23827,10 +23844,10 @@ "bYU" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/cleanable/dirt, /obj/structure/railing{ - dir = 9 + dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -23865,7 +23882,9 @@ /area/station/telecomms/chamber) "bZj" = ( /obj/structure/grille, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZk" = ( @@ -23875,7 +23894,9 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZl" = ( @@ -23885,7 +23906,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZm" = ( @@ -23907,7 +23930,9 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZo" = ( @@ -23922,7 +23947,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZp" = ( @@ -24421,7 +24448,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cbd" = ( @@ -24671,7 +24700,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cbS" = ( @@ -24999,7 +25030,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -25016,7 +25049,9 @@ }, /area/station/maintenance/port) "cdh" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cdk" = ( @@ -25025,7 +25060,9 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cdl" = ( @@ -25034,7 +25071,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cdn" = ( @@ -25081,7 +25120,9 @@ icon_state = "1-8" }, /obj/effect/landmark/start/engineer, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/smes) "cdq" = ( @@ -25781,7 +25822,9 @@ dir = 8; network = list("SS13","Singularity","Engineering") }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cgC" = ( @@ -26216,7 +26259,9 @@ /area/station/maintenance/port) "cio" = ( /obj/effect/landmark/spawner/xeno, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "cip" = ( @@ -27327,15 +27372,19 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "cnB" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "cnC" = ( -/obj/structure/railing/cap/reversed{ +/obj/structure/railing/corner{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -28118,7 +28167,9 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "cqV" = ( -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cqX" = ( @@ -28424,7 +28475,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/engineering/control) "csr" = ( @@ -28463,7 +28516,9 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/engineering/control) "csv" = ( @@ -29545,7 +29600,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "cxG" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cxJ" = ( @@ -29642,7 +29699,9 @@ /turf/simulated/floor/wood/parquet/tile, /area/station/service/library) "cyc" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) @@ -30949,7 +31008,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -31027,7 +31088,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cDu" = ( @@ -31110,7 +31173,9 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/engineering/control) "cDH" = ( @@ -31122,7 +31187,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cDI" = ( @@ -31214,7 +31281,9 @@ name = "Expedition Access" }, /obj/effect/mapping_helpers/airlock/access/all/command/expedition, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31342,7 +31411,9 @@ id_tag = "eva-shutters"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cER" = ( @@ -31356,7 +31427,9 @@ id_tag = "eva-shutters"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cES" = ( @@ -31785,7 +31858,9 @@ name = "Electrical Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32123,7 +32198,9 @@ /area/station/science/research) "cJa" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/research) "cJb" = ( @@ -32213,6 +32290,17 @@ icon_state = "neutral" }, /area/station/maintenance/dormitory_maintenance) +"cJs" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "cJz" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -32493,6 +32581,7 @@ }, /area/station/science/research) "cKD" = ( +/obj/structure/railing/corner, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -32591,6 +32680,7 @@ }, /area/station/medical/chemistry) "cKT" = ( +/obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -33172,6 +33262,9 @@ }, /area/station/science/research) "cNF" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/structure/table/glass, /obj/item/stock_parts/cell/high, /obj/structure/disposalpipe/segment, @@ -33182,19 +33275,16 @@ "cNG" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/brflowers, -/obj/structure/railing{ - dir = 9 - }, /turf/simulated/floor/grass, /area/station/science/research) "cNH" = ( /obj/effect/landmark/lightsout, -/obj/structure/railing{ - dir = 1 - }, /turf/simulated/floor/grass, /area/station/science/research) "cNJ" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/structure/table/glass, /obj/item/paicard, /turf/simulated/floor/plasteel{ @@ -33561,6 +33651,9 @@ }, /area/station/science/research) "cPq" = ( +/obj/structure/railing{ + dir = 4 + }, /obj/structure/table/glass, /obj/item/gps, /obj/item/flash{ @@ -33574,12 +33667,12 @@ /area/station/science/research) "cPr" = ( /obj/structure/flora/bush, -/obj/structure/railing{ - dir = 10 - }, /turf/simulated/floor/grass, /area/station/science/research) "cPt" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ dir = 1; @@ -34054,11 +34147,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cRI" = ( -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cRJ" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cRK" = ( @@ -34344,6 +34441,15 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) +"cSr" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/research) "cSs" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -34355,10 +34461,6 @@ }, /area/station/science/research) "cSu" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/cap/reversed, /turf/simulated/floor/grass, /area/station/science/research) "cSv" = ( @@ -34605,7 +34707,9 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/research) "cTD" = ( @@ -34856,7 +34960,9 @@ name = "Electrical Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cUT" = ( @@ -35033,7 +35139,9 @@ /obj/machinery/light/directional/east, /obj/item/folder/white, /obj/item/pen, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -35756,7 +35864,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cYj" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/science/research) @@ -35793,7 +35903,9 @@ /turf/simulated/floor/plasteel, /area/station/science/rnd) "cYq" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/rnd) "cYr" = ( @@ -35986,7 +36098,9 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "cZI" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/camera{ c_tag = "Medbay Virology Decontamination"; network = list("Medical","SS13") @@ -37158,7 +37272,9 @@ }, /area/station/maintenance/port2) "dfW" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/port2) "dfX" = ( @@ -37830,7 +37946,9 @@ }, /area/station/security/prison/cell_block/A) "djp" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/command/office/rd) "djq" = ( @@ -38968,7 +39086,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "dpS" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/port2) @@ -39074,7 +39194,9 @@ /turf/simulated/wall/r_wall, /area/station/science/robotics) "dqo" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "dqp" = ( @@ -39276,7 +39398,9 @@ /area/station/maintenance/port2) "drk" = ( /obj/structure/chair/office/light, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/port2) "drl" = ( @@ -39557,35 +39681,6 @@ icon_state = "darkred" }, /area/station/security/range) -"dsh" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/firealarm/directional/east, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel/dark, -/area/station/aisat) "dsn" = ( /obj/machinery/constructable_frame/machine_frame, /obj/item/circuitboard/cyborgrecharger, @@ -39876,7 +39971,9 @@ }, /area/station/medical/medbay2) "dtI" = ( -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "dtJ" = ( @@ -40144,7 +40241,9 @@ name = "Robotics Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -40213,7 +40312,9 @@ /area/station/science/robotics) "dvo" = ( /obj/effect/landmark/start/roboticist, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/robotics) "dvp" = ( @@ -40280,7 +40381,9 @@ }, /area/station/security/brig) "dvU" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "dwi" = ( @@ -40749,7 +40852,9 @@ /turf/simulated/floor/plasteel, /area/station/science/robotics) "dzX" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -41572,7 +41677,9 @@ /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "dEw" = ( -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "dEx" = ( @@ -41588,6 +41695,26 @@ "dEC" = ( /turf/simulated/floor/engine, /area/station/science/explab/chamber) +"dEE" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "dEH" = ( /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ @@ -41739,6 +41866,14 @@ }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) +"dFi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "dFm" = ( /turf/simulated/wall/r_wall, /area/station/science/storage) @@ -41887,6 +42022,13 @@ icon_state = "neutral" }, /area/station/maintenance/apmaint) +"dFZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "dGf" = ( /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -42118,7 +42260,9 @@ "dIb" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dIi" = ( @@ -42177,7 +42321,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/effect/mapping_helpers/airlock/access/any/science/research, /turf/simulated/floor/plasteel, @@ -42237,7 +42383,9 @@ dir = 1; network = list("Research","SS13") }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "dIN" = ( @@ -42952,7 +43100,9 @@ /obj/machinery/computer/rdconsole/robotics{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/robotics) "dOd" = ( @@ -43072,7 +43222,9 @@ /obj/structure/window/reinforced/polarized{ id = "RoboSurgery" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/science/robotics) "dOO" = ( @@ -43450,7 +43602,9 @@ id_tag = "evashutters2"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQf" = ( @@ -43463,7 +43617,9 @@ id = "evashutters2"; name = "Auxilary E.V.A. Storage" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQg" = ( @@ -43479,7 +43635,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQh" = ( @@ -43520,7 +43678,9 @@ name = "Auxiliary E.V.A." }, /obj/effect/mapping_helpers/airlock/access/any/command/eva, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQp" = ( @@ -43564,7 +43724,9 @@ anchored = 1; state = 2 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "dQD" = ( @@ -43740,7 +43902,9 @@ /area/station/maintenance/portsolar) "dRp" = ( /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/portsolar) "dRq" = ( @@ -43784,7 +43948,9 @@ /area/station/service/chapel) "dRB" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dRD" = ( @@ -43795,7 +43961,9 @@ "dRE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43804,7 +43972,9 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dRF" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dRG" = ( @@ -44251,7 +44421,9 @@ /area/station/maintenance/apmaint) "dTh" = ( /obj/machinery/door/airlock/maintenance, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) @@ -44378,11 +44550,6 @@ "dTy" = ( /turf/simulated/wall/r_wall, /area/station/security/checkpoint/south) -"dTB" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/space, -/area/space) "dTC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -44522,7 +44689,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dUm" = ( @@ -44639,7 +44808,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "dUF" = ( @@ -46229,6 +46400,11 @@ /area/station/security/permabrig) "efP" = ( /obj/structure/railing, +/obj/structure/railing/corner{ + dir = 10; + pixel_x = -8; + pixel_y = 3 + }, /obj/structure/chair/comfy/brown{ dir = 1 }, @@ -47078,34 +47254,15 @@ }, /area/station/maintenance/fore) "ewj" = ( +/obj/structure/railing{ + dir = 1 + }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/plasteel/white, /area/station/science/research) -"ewv" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "ewF" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -47190,6 +47347,9 @@ }, /area/station/security/warden) "exZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/machinery/atmospherics/binary/pump{ dir = 4 }, @@ -47537,6 +47697,18 @@ }, /turf/simulated/floor/carpet, /area/station/command/office/hop) +"eEd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/item/radio/intercom/directional/south, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "eEl" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /obj/effect/spawner/random_spawners/fungus_probably, @@ -47587,6 +47759,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/science/research) +"eFV" = ( +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellowcorner" + }, +/area/station/engineering/controlroom) "eFX" = ( /obj/structure/chair/sofa/right{ color = "#A30FAF"; @@ -47691,11 +47873,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "eId" = ( @@ -47888,7 +48065,9 @@ /turf/simulated/floor/wood/oak, /area/station/legal/magistrate) "eLd" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -48086,10 +48265,21 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "ePt" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "yellow" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ePD" = ( /obj/machinery/navbeacon{ @@ -48455,7 +48645,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "eUF" = ( @@ -48929,15 +49121,20 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "fhC" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/obj/machinery/atmospherics/meter, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "fhF" = ( /turf/space, @@ -49061,13 +49258,6 @@ }, /turf/simulated/floor/plating, /area/station/legal/courtroom) -"fjw" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/obj/effect/spawner/window/reinforced/plasma/grilled, -/turf/simulated/floor/plating, -/area/station/engineering/controlroom) "fjF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -49364,9 +49554,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "fpj" = ( @@ -50127,11 +50314,6 @@ /obj/effect/spawner/wire_splicing/thirty, /turf/simulated/floor/plating, /area/station/maintenance/port) -"fCZ" = ( -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "fDh" = ( /obj/structure/rack, /obj/item/crowbar/red, @@ -50413,7 +50595,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -50726,13 +50910,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) -"fNS" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/engineering/engine/supermatter) "fOa" = ( /obj/effect/turf_decal/delivery/hollow, /obj/machinery/floodlight, @@ -50761,6 +50938,11 @@ icon_state = "escape" }, /area/station/bridge/checkpoint/south) +"fOs" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/space, +/area/space/nearstation) "fOy" = ( /obj/item/kirbyplants, /obj/effect/turf_decal/delivery/hollow, @@ -51419,10 +51601,6 @@ /obj/machinery/newscaster/directional/south, /turf/simulated/floor/carpet, /area/station/medical/psych) -"fXC" = ( -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "fXQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -51494,20 +51672,6 @@ icon_state = "redyellowfull" }, /area/station/maintenance/old_kitchen) -"fZy" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/space, -/area/space) "fZJ" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -51599,16 +51763,13 @@ }, /area/station/hallway/primary/central) "gba" = ( -/obj/machinery/atmospherics/trinary/tvalve/digital{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/structure/cable{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -51721,26 +51882,6 @@ icon_state = "darkred" }, /area/station/security/evidence) -"gdE" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/light/directional/south, -/obj/machinery/status_display/directional/south, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/light/directional/south, -/obj/machinery/status_display/directional/south, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "gdK" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -52337,7 +52478,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gpP" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/door_control/shutter/south{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; @@ -52819,6 +52962,11 @@ /obj/machinery/alarm/engine{ pixel_y = 24 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/engine/supermatter) "gxr" = ( @@ -53009,34 +53157,15 @@ }, /area/station/medical/morgue) "gBo" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/turf/simulated/floor/plasteel{ + icon_state = "yellowcorner" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gBF" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/welding/flamedecal/blue{ pixel_y = 5 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light/small/directional/south{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gBH" = ( @@ -53417,30 +53546,6 @@ icon_state = "neutralfull" }, /area/station/security/lobby) -"gJy" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/atmospherics/meter, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel/dark, -/area/station/aisat) "gJA" = ( /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ @@ -53476,13 +53581,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) -"gJL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) "gJQ" = ( /turf/simulated/floor/wood, /area/station/command/office/hos) @@ -53569,7 +53667,9 @@ /turf/simulated/floor/plasteel/freezer, /area/station/public/toilet) "gLk" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -54186,7 +54286,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/aitransit) "gVw" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/engine, /area/station/medical/chemistry) @@ -54915,28 +55017,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/security/warden) -"hjH" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "hjJ" = ( /obj/machinery/sleeper{ dir = 4 @@ -55146,15 +55226,20 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "hox" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable{ - d1 = 4; + d1 = 1; d2 = 8; - icon_state = "4-8" + icon_state = "1-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "hoG" = ( /obj/effect/decal/cleanable/dirt, @@ -55554,15 +55639,16 @@ }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) -"hwq" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/space, -/area/space) -"hwu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +"hwg" = ( +/obj/structure/railing/corner{ + dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/research) +"hwu" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -55678,9 +55764,9 @@ dir = 8 }, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) @@ -55977,7 +56063,9 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/science/research) @@ -56092,19 +56180,10 @@ /area/station/maintenance/apmaint) "hEn" = ( /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/power/emitter, -/turf/simulated/floor/plasteel, +/obj/structure/lattice/catwalk, +/turf/space, /area/station/engineering/controlroom) "hEF" = ( /obj/structure/cable{ @@ -56302,7 +56381,9 @@ /area/station/science/research) "hHr" = ( /obj/machinery/light/directional/north, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/supply/storage) "hHx" = ( @@ -56545,7 +56626,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, @@ -56588,12 +56671,16 @@ }, /area/station/security/brig) "hLA" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -57418,9 +57505,11 @@ }, /area/station/security/permabrig) "hZW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "iaw" = ( @@ -58449,6 +58538,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/station/service/theatre) +"iqR" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/trinary/mixer/flipped{ + dir = 8; + name = "Миксер топливной смеси турбины" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "ird" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -58848,39 +58945,6 @@ }, /turf/simulated/floor/plating, /area/station/science/toxins/launch) -"ixt" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/camera{ - c_tag = "Minisat Power Station"; - dir = 8; - network = list("SS13","Minisat") - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/structure/showcase{ - density = 0; - dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; - pixel_x = -9; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plating, -/area/station/turret_protected/aisat) "ixA" = ( /obj/effect/turf_decal/delivery/hollow, /obj/machinery/recharge_station, @@ -58949,6 +59013,15 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/aft) +"iyC" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/power/emitter{ + anchored = 1; + dir = 1; + state = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ize" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -58970,14 +59043,11 @@ }, /area/station/medical/surgery/primary) "izz" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/station/engineering/atmos) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "izD" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse/gray, @@ -59365,29 +59435,6 @@ }, /turf/simulated/floor/plating, /area/station/engineering/controlroom) -"iGO" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "iHc" = ( /obj/structure/closet/crate/can, /obj/structure/window/reinforced{ @@ -60161,6 +60208,14 @@ "iVy" = ( /turf/simulated/wall, /area/station/security/range) +"iVF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "iVI" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil, @@ -60380,6 +60435,11 @@ /obj/effect/turf_decal/stripes/corner{ dir = 2 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "iZR" = ( @@ -60796,18 +60856,19 @@ }, /area/station/security/brig) "jhG" = ( +/obj/machinery/camera{ + c_tag = "Supermatter East"; + dir = 8; + network = list("Engineering","SS13") + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "jhH" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -61373,7 +61434,9 @@ /area/station/science/genetics) "jpy" = ( /obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "jpB" = ( @@ -61471,8 +61534,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jqX" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -61690,7 +61761,6 @@ "jvm" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/random/hampter, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -62449,12 +62519,6 @@ icon_state = "red" }, /area/station/engineering/atmos) -"jJh" = ( -/obj/structure/railing/cap/normal{ - dir = 4 - }, -/turf/simulated/floor/wood/oak, -/area/station/service/theatre) "jJj" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -63499,7 +63563,7 @@ /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "kaO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /obj/structure/cable{ @@ -63507,10 +63571,16 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/controlroom) +/area/station/engineering/atmos) "kaP" = ( /obj/machinery/light/directional/south, /obj/structure/table/wood, @@ -63670,7 +63740,9 @@ locked = 1; name = "Escape External Access" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/access_button/east{ autolink_id = "escape_btn_ext"; name = "exterior access button"; @@ -63755,16 +63827,6 @@ icon_state = "neutral" }, /area/station/maintenance/apmaint) -"ker" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery/hollow, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ket" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -64017,7 +64079,9 @@ }, /area/station/supply/storage) "kiB" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/turf_decal/delivery/hollow, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, @@ -64169,7 +64233,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -64370,6 +64436,22 @@ /obj/effect/spawner/random_spawners/fungus_probably, /turf/simulated/wall, /area/station/maintenance/old_kitchen) +"kqp" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/portable/canister/nitrogen, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "kqF" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -64525,11 +64607,8 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "kur" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/power/emitter, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellowcorner" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "kut" = ( @@ -64555,14 +64634,16 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "kuJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/machinery/power/emitter{ anchored = 1; - dir = 1; state = 2 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellowcorner" + dir = 9; + icon_state = "yellow" }, /area/station/engineering/controlroom) "kuK" = ( @@ -65358,7 +65439,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/main) "kIs" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -65398,13 +65481,9 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "kJd" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/status_display/directional/west, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/engineering/controlroom) "kJV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65510,27 +65589,6 @@ icon_state = "redfull" }, /area/station/security/brig) -"kMh" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/wall/r_wall, -/area/station/turret_protected/aisat) "kMn" = ( /obj/machinery/hologram/holopad{ pixel_x = 16 @@ -66219,6 +66277,9 @@ /turf/simulated/floor/engine, /area/station/science/test_chamber) "kWO" = ( +/obj/structure/railing/corner{ + dir = 4 + }, /obj/structure/disposalpipe/junction/reversed, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -66255,21 +66316,6 @@ icon_state = "whiteyellowfull" }, /area/station/medical/chemistry) -"kXZ" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/obj/structure/table/reinforced, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/station/engineering/atmos) "kYh" = ( /obj/structure/table/wood, /obj/item/camera_film, @@ -67268,14 +67314,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "lqL" = ( -/obj/effect/turf_decal/stripes, -/obj/machinery/door/poddoor{ - id_tag = "SpaceDropSM"; - protected = 0; - name = "SM Drop Door" +/obj/machinery/mass_driver/sm_mass_driver{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/supermatter_crystal/engine, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "lrb" = ( /obj/structure/cable{ d1 = 1; @@ -67427,13 +67471,6 @@ icon_state = "whitepurple" }, /area/station/science/toxins/mixing) -"ltw" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "ltA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, @@ -68612,9 +68649,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "lNO" = ( -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + icon_state = "neutralfull" }, /area/station/engineering/controlroom) "lOk" = ( @@ -69129,15 +69168,15 @@ }, /area/station/medical/virology) "lWo" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/power/smes{ + charge = 1e+006 }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel/dark, +/area/station/maintenance/turbine) "lWq" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -69183,12 +69222,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"lYq" = ( -/obj/structure/table/wood/poker, -/obj/effect/decal/cleanable/dirt, -/obj/random/hampter, -/turf/simulated/floor/plasteel/grimy, -/area/station/maintenance/abandonedbar) "lYz" = ( /obj/effect/spawner/random_spawners/grille_maybe, /obj/structure/cable{ @@ -70318,6 +70351,7 @@ /area/station/hallway/secondary/exit) "muI" = ( /obj/machinery/hologram/holopad, +/obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -70354,6 +70388,15 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/sw) +"mwn" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/research) "mwo" = ( /obj/effect/landmark/start/doctor, /turf/simulated/floor/plasteel{ @@ -70455,13 +70498,18 @@ }, /area/station/security/brig) "mxG" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/station/maintenance/auxsolarport) +/obj/structure/window/plasmareinforced{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "myf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71128,6 +71176,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"mPO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "mPR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71163,11 +71220,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "mPZ" = ( @@ -71461,14 +71513,13 @@ }, /area/station/medical/reception) "mTu" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/controlroom) +/area/station/hallway/secondary/entry) "mTw" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/wood/oak, @@ -71756,6 +71807,17 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/research) +"mZv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "mZR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -71856,26 +71918,6 @@ /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) -"naT" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/light/directional/north, -/obj/machinery/ai_status_display/north, -/obj/machinery/teleport/station, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/porta_turret, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/station/turret_protected/aisat) "naX" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -71914,18 +71956,14 @@ }, /area/station/security/processing) "nbG" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, +/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "nch" = ( @@ -71958,10 +71996,6 @@ /area/station/medical/virology/lab) "ncs" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/cap/normal, /turf/simulated/floor/grass, /area/station/science/research) "nct" = ( @@ -72449,30 +72483,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) -"nks" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/power/terminal, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "nkB" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -74461,11 +74471,12 @@ }, /area/station/hallway/secondary/exit/maintenance) "nPe" = ( -/obj/machinery/atmospherics/trinary/mixer/flipped{ - dir = 8; - name = "Миксер топливной смеси турбины" +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 }, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "nPi" = ( @@ -74729,15 +74740,6 @@ icon_state = "purple" }, /area/station/service/janitor) -"nUm" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "nUp" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal, @@ -74788,6 +74790,23 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) +"nUR" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/unary/thermomachine/freezer{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "nVf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -74917,29 +74936,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) -"nWY" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/corner, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "nXa" = ( /obj/structure/table/reinforced, /obj/item/clipboard{ @@ -75100,6 +75096,19 @@ icon_state = "neutralfull" }, /area/station/public/fitness) +"oan" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/machinery/economy/vending/wallmed/directional/south, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "oav" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/peppermill, @@ -75247,9 +75256,19 @@ }, /area/station/security/permabrig) "ocA" = ( -/obj/structure/closet/radiation, +/obj/machinery/camera{ + c_tag = "Supermatter West"; + dir = 4; + network = list("Engineering","SS13"); + pixel_y = -22 + }, /obj/effect/turf_decal/delivery/hollow, -/obj/item/clothing/glasses/meson, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/portable/canister/toxins, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ocJ" = ( @@ -75347,6 +75366,22 @@ }, /turf/simulated/floor/plating, /area/station/science/robotics/showroom) +"oeZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "off" = ( /turf/simulated/floor/plasteel{ icon_state = "red" @@ -75786,6 +75821,12 @@ "omV" = ( /turf/simulated/wall/r_wall, /area/station/medical/storage/secondary) +"onA" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "onD" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -75893,7 +75934,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "ooN" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -75999,13 +76042,17 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/dormitory_maintenance) "oql" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/station/engineering/controlroom) +/obj/machinery/firealarm/directional/east, +/turf/simulated/floor/plasteel, +/area/station/maintenance/turbine) "oqq" = ( /obj/effect/decal/cleanable/dust, /obj/machinery/light/small/directional/east, @@ -76091,35 +76138,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"orS" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/structure/showcase{ - density = 0; - dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; - pixel_x = -9; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/lattice, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/space, -/area/space/nearstation) "osf" = ( /obj/effect/decal/cleanable/ants, /turf/simulated/floor/plasteel{ @@ -76348,7 +76366,9 @@ id_tag = "eva-shutters"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -76493,6 +76513,15 @@ icon_state = "neutral" }, /area/station/maintenance/port) +"ozX" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/research) "oAd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -76531,23 +76560,14 @@ }, /area/station/hallway/primary/port) "oAP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/corner{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/analyzer, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "oAU" = ( @@ -76678,11 +76698,11 @@ }, /area/station/science/genetics) "oCV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line, +/obj/structure/reflector/box{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/engineering/controlroom) "oCX" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/wood/oak, @@ -76939,7 +76959,9 @@ }, /area/station/medical/break_room) "oJn" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -77019,11 +77041,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oKV" = ( -/obj/machinery/power/emitter, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "yellow" - }, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "oLg" = ( /obj/structure/cable{ @@ -77520,6 +77540,10 @@ dir = 1 }, /obj/machinery/power/apc/super/north, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel, /area/station/engineering/engine/supermatter) "oVE" = ( @@ -77996,7 +78020,9 @@ dir = 1; network = list("Engineering","SS13") }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/item/radio/intercom/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/plasteel, @@ -78303,17 +78329,10 @@ /area/station/maintenance/fore) "pih" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 1; + d1 = 2; d2 = 8; - icon_state = "1-8" + icon_state = "2-8" }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "piq" = ( @@ -78553,7 +78572,9 @@ }, /area/station/medical/virology/lab) "plN" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "pmA" = ( @@ -79707,11 +79728,18 @@ /area/station/science/explab) "pGk" = ( /obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/railing{ + dir = 6; + pixel_x = 6; + pixel_y = -4 + }, /obj/item/kirbyplants{ pixel_y = 7 }, -/obj/structure/railing{ - dir = 6 +/obj/structure/railing/corner{ + dir = 9; + pixel_x = 2; + pixel_y = -28 }, /turf/simulated/floor/grass, /area/station/science/research) @@ -79924,29 +79952,6 @@ }, /turf/simulated/floor/plasteel, /area/station/command/teleporter) -"pJf" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table/reinforced, -/obj/item/tank/internals/plasma, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "pJj" = ( /obj/effect/decal/cleanable/generic, /obj/effect/spawner/random_spawners/cobweb_right_frequent, @@ -79961,20 +79966,13 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "pJw" = ( -/obj/machinery/light/directional/west, -/obj/structure/cable/yellow{ +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/meter, +/obj/structure/dispenser, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "pJP" = ( @@ -80231,17 +80229,6 @@ icon_state = "whitepurple" }, /area/station/science/break_room) -"pNz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/maintenance/turbine) "pOf" = ( /obj/structure/disposalpipe/junction/y{ dir = 4 @@ -80264,10 +80251,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "pOi" = ( +/obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 8 }, -/obj/machinery/economy/atm/east, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "pOp" = ( @@ -80299,7 +80287,9 @@ /area/station/supply/office) "pOF" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel{ dir = 4; @@ -80343,9 +80333,6 @@ "pPG" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/bush, -/obj/structure/railing{ - dir = 6 - }, /turf/simulated/floor/grass, /area/station/science/research) "pPL" = ( @@ -80488,20 +80475,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "pSJ" = ( -/obj/machinery/camera{ - c_tag = "Supermatter East"; - dir = 8; - network = list("Engineering","SS13") - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/portable/canister/nitrogen, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular{ + pixel_y = 6 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -80748,13 +80725,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pYc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/atmospherics/binary/valve/digital, +/obj/machinery/driver_button/sm_drop_button{ + pixel_y = -16; + pixel_x = 8; + range = 20 }, -/area/station/engineering/controlroom) +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "pYk" = ( /obj/machinery/flasher{ pixel_x = -24; @@ -80769,19 +80747,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) -"pYn" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/wall, -/area/station/hallway/secondary/entry) "pYo" = ( /obj/structure/coatrack, /turf/simulated/floor/plasteel{ @@ -80890,6 +80855,13 @@ }, /turf/simulated/wall/r_wall, /area/station/engineering/atmos/control) +"qaS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "qbb" = ( /obj/structure/window/reinforced{ dir = 4 @@ -81006,14 +80978,6 @@ }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) -"qdk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/secondary/entry) "qdm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -81023,15 +80987,9 @@ }, /area/station/medical/sleeper) "qdE" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/stack/cable_coil/random, -/obj/item/stack/cable_coil/random, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/structure/lattice, +/turf/space, +/area/station/hallway/secondary/entry) "qdW" = ( /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, @@ -81213,11 +81171,9 @@ }, /area/station/security/permabrig) "qhe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, +/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "qhF" = ( @@ -82482,12 +82438,19 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "qEN" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/spawner/window/reinforced/plasma/grilled, -/turf/simulated/floor/plating, -/area/station/engineering/engine/supermatter) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "qEO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -82579,32 +82542,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) -"qFY" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/trinary/filter{ - dir = 4; - filter_type = "o2"; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "qGa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -82651,7 +82588,9 @@ /area/station/medical/virology/lab) "qGy" = ( /obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/table/reinforced, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 @@ -83171,9 +83110,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "qPc" = ( @@ -83618,6 +83554,13 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) +"qWG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/radio/intercom/directional/west, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "qWV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -84128,22 +84071,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "rfH" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "rfK" = ( /obj/structure/disposalpipe/segment{ @@ -84193,6 +84131,19 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) +"rfT" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/portable/canister/nitrogen, +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "rgg" = ( /obj/machinery/fishtank/wall, /turf/simulated/wall, @@ -84500,27 +84451,6 @@ icon_state = "neutralfull" }, /area/station/public/storage/tools) -"rme" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "rmw" = ( /obj/machinery/door/window/reinforced/normal{ dir = 8 @@ -85069,6 +84999,22 @@ /obj/structure/table/reinforced, /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) +"rwj" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "rwn" = ( /obj/effect/spawner/lootdrop/trash, /turf/simulated/floor/plating, @@ -85322,6 +85268,20 @@ icon_state = "white" }, /area/station/medical/chemistry) +"rAC" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "rAL" = ( /obj/machinery/power/apc/directional/west, /obj/structure/cable{ @@ -86939,6 +86899,17 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"sdI" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "sea" = ( /obj/structure/cable{ d1 = 4; @@ -88015,7 +87986,9 @@ /area/station/hallway/primary/central) "sxp" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, /obj/item/gps/engineering, @@ -88061,16 +88034,6 @@ icon_state = "purple" }, /area/station/service/janitor) -"syc" = ( -/obj/structure/table/reinforced, -/obj/item/paper/sm_paper, -/obj/machinery/sm_drop_controll_buttons{ - req_access_txt = "56"; - pixel_x = 8; - pixel_y = -16 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/office/ce) "syi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -89167,7 +89130,9 @@ /area/station/engineering/atmos) "sQj" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -89215,19 +89180,13 @@ /turf/simulated/floor/carpet, /area/station/service/library) "sQZ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "yellow" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "sRE" = ( /obj/structure/cable{ @@ -89794,13 +89753,15 @@ /turf/simulated/wall, /area/station/maintenance/virology_maint) "tep" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, -/obj/machinery/atmospherics/meter, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "teI" = ( /obj/structure/cable{ @@ -90974,12 +90935,12 @@ }, /area/station/medical/surgery/secondary) "tzp" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/delivery/hollow, -/obj/item/clothing/glasses/meson, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "tzq" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -91084,14 +91045,10 @@ }, /area/station/engineering/atmos) "tCb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/cap/normal{ - dir = 8 - }, /turf/simulated/floor/plasteel{ - icon_state = "bar" + icon_state = "dark" }, -/area/station/maintenance/fsmaint) +/area/station/service/bar/atrium) "tCF" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -91148,21 +91105,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "tEe" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/space, /area/station/engineering/controlroom) "tEi" = ( /turf/simulated/floor/plasteel{ @@ -91289,7 +91236,9 @@ }, /area/station/engineering/atmos/control) "tFt" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -91574,6 +91523,9 @@ /area/station/hallway/secondary/entry) "tJO" = ( /obj/structure/disposalpipe/segment, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91881,10 +91833,19 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "tQK" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/space, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "tQS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -92046,6 +92007,9 @@ }, /area/station/maintenance/port) "tUw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/structure/reflector/box{ dir = 4 }, @@ -92344,16 +92308,6 @@ /obj/structure/closet, /turf/simulated/floor/plasteel/dark, /area/station/security/evidence) -"tYw" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/meter, -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "tYB" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -92798,6 +92752,13 @@ icon_state = "white" }, /area/station/medical/sleeper) +"ufU" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/reflector/box{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "uge" = ( /obj/structure/cable{ d1 = 4; @@ -93135,16 +93096,23 @@ }, /area/station/security/storage) "uly" = ( -/obj/machinery/light/directional/east, /obj/structure/cable/yellow{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ulI" = ( @@ -93475,7 +93443,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/engineering/control) @@ -93569,19 +93539,6 @@ }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) -"uud" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/space, -/area/space) "uuE" = ( /obj/structure/chair{ dir = 4 @@ -93629,7 +93586,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "uvQ" = ( @@ -93893,13 +93852,16 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) "uBp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/window/plasmareinforced{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/simulated/floor/engine, +/obj/effect/spawner/window/reinforced/plasma/grilled, +/turf/simulated/floor/plating, /area/station/engineering/engine/supermatter) "uBD" = ( /obj/structure/cable{ @@ -94006,11 +93968,6 @@ icon_state = "cmo" }, /area/station/medical/break_room) -"uEC" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "uFe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -94216,14 +94173,8 @@ /area/station/medical/virology) "uJs" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 10 }, -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/analyzer, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uJu" = ( @@ -94497,12 +94448,11 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "uMY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 }, +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uNf" = ( /obj/structure/disposalpipe/segment{ @@ -94591,21 +94541,6 @@ icon_state = "darkbluefull" }, /area/station/service/expedition) -"uNZ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "uOa" = ( /obj/item/chair/light, /obj/effect/decal/cleanable/dirt, @@ -95073,6 +95008,14 @@ }, /turf/simulated/floor/engine, /area/station/science/test_chamber) +"uUh" = ( +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" + }, +/turf/simulated/floor/plating, +/area/station/engineering/engine/supermatter) "uUo" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -95352,16 +95295,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "uYk" = ( +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/portable/canister/toxins, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uYD" = ( @@ -97055,9 +96991,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "vHD" = ( @@ -97239,7 +97172,9 @@ locked = 1; name = "Escape External Access" }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button/east{ autolink_id = "escape_btn_int"; @@ -97275,9 +97210,6 @@ "vKB" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/ppflowers, -/obj/structure/railing{ - dir = 5 - }, /turf/simulated/floor/grass, /area/station/science/research) "vLh" = ( @@ -97302,7 +97234,9 @@ }, /area/station/service/bar/atrium) "vLS" = ( -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/turf_decal/delivery/hollow, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, @@ -97454,17 +97388,15 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "vOo" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 10 +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" }, -/obj/machinery/sm_drop_controll_buttons{ - req_access_txt = "56"; - pixel_x = 8; - pixel_y = -16 +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/space, -/area/space/nearstation) +/area/station/engineering/controlroom) "vOA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -97846,6 +97778,24 @@ icon_state = "white" }, /area/station/medical/virology) +"vVB" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "vVF" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -98241,15 +98191,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) "waQ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/portable/canister/nitrogen, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/atmospherics/trinary/filter{ + dir = 1; + filter_type = "n2"; + name = "nitrogen filter"; + on = 1 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -99032,6 +98978,18 @@ "wpW" = ( /turf/simulated/wall, /area/station/maintenance/dormitory_maintenance) +"wqp" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "wqG" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "hos_room" @@ -99325,12 +99283,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) -"wwE" = ( -/obj/structure/reflector/box{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "wwR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -99471,27 +99423,6 @@ icon_state = "yellow" }, /area/station/engineering/control) -"wzM" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "wzN" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -99527,24 +99458,6 @@ }, /turf/simulated/floor/plating, /area/station/security/brig) -"wAp" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/power/terminal, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/wall/r_wall, -/area/station/engineering/controlroom) "wAU" = ( /obj/effect/mapping_helpers/airlock/polarized{ id = "HoS" @@ -100264,14 +100177,25 @@ }, /area/station/security/brig) "wQE" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson, -/obj/effect/turf_decal/delivery/hollow, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "wQG" = ( /obj/structure/cable{ @@ -100294,22 +100218,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) -"wQS" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "wRa" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -102276,32 +102184,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) -"xzF" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "xzH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -102384,11 +102266,18 @@ }, /area/station/maintenance/medmaint) "xBJ" = ( +/obj/structure/railing{ + dir = 10; + pixel_x = -6; + pixel_y = -4 + }, /obj/item/kirbyplants{ pixel_y = 7 }, -/obj/structure/railing{ - dir = 10 +/obj/structure/railing/corner{ + dir = 5; + pixel_x = -2; + pixel_y = -28 }, /turf/simulated/floor/grass, /area/station/science/research) @@ -103164,20 +103053,6 @@ icon_state = "yellow" }, /area/station/engineering/break_room) -"xNL" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/structure/lattice, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/space, -/area/space/nearstation) "xNW" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -103551,7 +103426,9 @@ /area/station/medical/sleeper) "xTK" = ( /obj/machinery/light/directional/north, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /obj/effect/turf_decal/delivery/hollow, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, @@ -104063,34 +103940,6 @@ icon_state = "neutralcorner" }, /area/station/maintenance/starboard2) -"ycN" = ( -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: <<<" - }, -/obj/effect/turf_decal/stripes/line, -/obj/item/radio/intercom/directional/south, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: ---" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/item/radio/intercom/directional/south, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/merge_conflict_marker{ - name = "Merge Conflict Marker: >>>" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ycZ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -104212,6 +104061,9 @@ /turf/simulated/wall, /area/station/public/sleep_male) "ygd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/machinery/atmospherics/binary/pump{ dir = 8 }, @@ -106815,62 +106667,86 @@ aaa aaa aaa aaa -"} -(10,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(10,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -107048,6 +106924,8 @@ aaa aaa aaa aaa +"} +(11,1,1) = {" aaa aaa aaa @@ -107072,8 +106950,6 @@ aaa aaa aaa aaa -"} -(11,1,1) = {" aaa aaa aaa @@ -107305,6 +107181,8 @@ aaa aaa aaa aaa +"} +(12,1,1) = {" aaa aaa aaa @@ -107329,8 +107207,6 @@ aaa aaa aaa aaa -"} -(12,1,1) = {" aaa aaa aaa @@ -107562,6 +107438,8 @@ aaa aaa aaa aaa +"} +(13,1,1) = {" aaa aaa aaa @@ -107586,8 +107464,6 @@ aaa aaa aaa aaa -"} -(13,1,1) = {" aaa aaa aaa @@ -107819,6 +107695,8 @@ aaa aaa aaa aaa +"} +(14,1,1) = {" aaa aaa aaa @@ -107843,8 +107721,6 @@ aaa aaa aaa aaa -"} -(14,1,1) = {" aaa aaa aaa @@ -108076,6 +107952,8 @@ aaa aaa aaa aaa +"} +(15,1,1) = {" aaa aaa aaa @@ -108100,8 +107978,6 @@ aaa aaa aaa aaa -"} -(15,1,1) = {" aaa aaa aaa @@ -108333,6 +108209,8 @@ aaa aaa aaa aaa +"} +(16,1,1) = {" aaa aaa aaa @@ -108357,8 +108235,6 @@ aaa aaa aaa aaa -"} -(16,1,1) = {" aaa aaa aaa @@ -108474,17 +108350,6 @@ aaa aaa aaa aaa -bmo -bpm -pVN -bpm -orS -bpm -bmo -bmo -bmo -bmo -bmo aaa aaa aaa @@ -108601,6 +108466,8 @@ aaa aaa aaa aaa +"} +(17,1,1) = {" aaa aaa aaa @@ -108614,8 +108481,6 @@ aaa aaa aaa aaa -"} -(17,1,1) = {" aaa aaa aaa @@ -108730,19 +108595,6 @@ aaa aaa aaa aaa -bkt -bpn -brp -brp -brp -gJy -blv -blO -brp -brp -brp -cpb -bLR aaa aaa aaa @@ -108987,27 +108839,6 @@ aaa aaa aaa aaa -bku -bpo -bLM -kVT -bPC -dsh -bTs -bVH -brq -bms -bnR -bpo -brr -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -109128,10 +108959,6 @@ aaa aaa aaa aaa -"} -(19,1,1) = {" -aaa -aaa aaa aaa aaa @@ -109153,6 +108980,8 @@ aaa aaa aaa aaa +"} +(19,1,1) = {" aaa aaa aaa @@ -109231,32 +109060,6 @@ aaa aaa aaa aaa -abj -bpm -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bPR -bpo -brr -bNM -bNM -kMh -bTt -bNM -bNM -bNM -bkt -bpo -bLR aaa aaa aaa @@ -109385,8 +109188,6 @@ aaa aaa aaa aaa -"} -(20,1,1) = {" aaa aaa aaa @@ -109436,6 +109237,8 @@ aaa aaa aaa aaa +"} +(20,1,1) = {" aaa aaa aaa @@ -109488,32 +109291,6 @@ aaa aaa aaa aaa -bku -bpn -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -bJQ -brs -bNM -bPG -ixt -bTu -bVJ -ccx -bNM -bkt -lvH -brr aaa aaa aaa @@ -109642,8 +109419,6 @@ aaa aaa aaa aaa -"} -(21,1,1) = {" aaa aaa aaa @@ -109719,6 +109494,8 @@ aaa aaa aaa aaa +"} +(21,1,1) = {" aaa aaa aaa @@ -109745,37 +109522,6 @@ aaa aaa aaa aaa -ops -bpo -brq -bpu -bms -bms -rNb -bpu -bms -bms -bpu -bms -bms -bpu -bms -aaa -bNM -bPH -bSr -bTv -bXI -cgI -bNM -bkt -lvH -dSz -pVN -bpm -pVN -bmo -bpm aaa aaa aaa @@ -109899,8 +109645,6 @@ aaa aaa aaa aaa -"} -(22,1,1) = {" aaa aaa aaa @@ -110002,43 +109746,13 @@ aaa aaa aaa aaa -bkt -bpo -brr -abj -abj -abj -btd -btd -btd -btd -btd -btd -btd -btd -btd -btd -bNM -bPO -bTc -bTw -bVL -chu -bNM -bku -boe -mRz -mRz -mRz -mRz -brp -cpb -brs aaa aaa aaa aaa aaa +"} +(22,1,1) = {" aaa aaa aaa @@ -110156,8 +109870,6 @@ aaa aaa aaa aaa -"} -(23,1,1) = {" aaa aaa aaa @@ -110259,38 +109971,7 @@ aaa aaa aaa aaa -bku -bpo -brs -abj -abj -btd -btd -btd -bzv -btd -btd -btd -bvz -btd -bzv -btd -bNM -bPP -bUD -hzl -bXI -chE -bNM aaa -bpu -bms -bms -bpu -bms -bPC -bpo -brs aaa aaa aaa @@ -110327,6 +110008,8 @@ aaa aaa aaa aaa +"} +(23,1,1) = {" aaa aaa aaa @@ -110413,8 +110096,6 @@ aaa aaa aaa aaa -"} -(24,1,1) = {" aaa aaa aaa @@ -110444,6 +110125,17 @@ aaa aaa aaa aaa +bmo +bpm +pVN +bpm +pVN +bpm +bmo +bmo +bmo +bmo +bmo aaa aaa aaa @@ -110516,38 +110208,7 @@ aaa aaa aaa aaa -ops -bpo -brs aaa -btd -btd -btd -bxX -bzw -btd -bCT -btd -bzw -bzD -bJR -btd -bNM -bPQ -bXm -bTI -bVN -cmx -bNM -qrT -qrT -qrT -qrT -qrT -abj -bku -bpo -brs aaa aaa aaa @@ -110604,6 +110265,8 @@ aaa aaa aaa aaa +"} +(24,1,1) = {" aaa aaa aaa @@ -110670,8 +110333,6 @@ aaa aaa aaa aaa -"} -(25,1,1) = {" aaa aaa aaa @@ -110720,6 +110381,19 @@ aaa aaa aaa aaa +bkt +bpn +brp +brp +brp +bRr +blv +blO +brp +brp +brp +cpb +bLR aaa aaa aaa @@ -110773,38 +110447,6 @@ aaa aaa aaa aaa -bku -bpo -brr -abj -btd -btd -bwG -bxY -byg -bBd -bCU -bwG -bBf -bxY -bBf -tEw -bNM -bNM -bNM -bTz -bNM -bNM -bNM -qrT -qrT -qrT -qrT -qrT -qrT -bkt -bpo -brs aaa aaa aaa @@ -110880,6 +110522,8 @@ aaa aaa aaa aaa +"} +(25,1,1) = {" aaa aaa aaa @@ -110927,8 +110571,6 @@ aaa aaa aaa aaa -"} -(26,1,1) = {" aaa aaa aaa @@ -110996,6 +110638,19 @@ aaa aaa aaa aaa +bku +bpo +bLM +kVT +bPC +bRs +bTs +bVH +brq +bms +bnR +bpo +brr aaa aaa aaa @@ -111029,40 +110684,7 @@ aaa aaa aaa aaa -bmo -bnM -bpo -brs aaa -btd -bvz -bLQ -bxZ -bzy -bIh -bCV -bIh -bIh -bIh -bJS -bwH -bNN -bPI -bVO -bTG -bVO -bPI -bNM -qrT -rSI -vzz -eaH -qrT -qrT -bkt -bpo -bLS -bmo aaa aaa aaa @@ -111157,6 +110779,23 @@ aaa aaa aaa aaa +"} +(26,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111184,8 +110823,6 @@ aaa aaa aaa aaa -"} -(27,1,1) = {" aaa aaa aaa @@ -111245,6 +110882,34 @@ aaa aaa aaa aaa +abj +bpm +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bPR +bpo +brr +bNM +bNM +bNM +bTt +bNM +bNM +bNM +bkt +bpo +bLR +aaa +aaa aaa aaa aaa @@ -111285,42 +110950,6 @@ aaa aaa aaa aaa -bkt -bmp -cqK -bpq -brr -btd -btd -btd -bBg -bye -bzz -bBf -bEF -bBf -bBf -bgN -bJT -bLO -bNM -bPJ -bRz -bTB -bVS -bXH -bNM -caV -caW -fmm -fmm -chX -qrT -bku -bmq -cqK -csk -brs aaa aaa aaa @@ -111407,6 +111036,8 @@ aaa aaa aaa aaa +"} +(27,1,1) = {" aaa aaa aaa @@ -111441,8 +111072,6 @@ aaa aaa aaa aaa -"} -(28,1,1) = {" aaa aaa aaa @@ -111510,6 +111139,32 @@ aaa aaa aaa aaa +bku +bpn +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +bJQ +brs +bNM +bPG +bRx +bTu +bVJ +ccx +bNM +bkt +lvH +brr aaa aaa aaa @@ -111542,42 +111197,6 @@ aaa aaa aaa aaa -bku -bmq -bnO -bpq -brs -btd -btd -byg -bBf -bye -bBf -btd -btd -bIi -naX -bwJ -bhV -bNL -bNM -bSo -bVS -bTE -bVS -bXI -qrT -ccU -caW -ceP -fmm -fBl -qrT -bkt -bmq -cqL -bpq -brs aaa aaa aaa @@ -111674,6 +111293,8 @@ aaa aaa aaa aaa +"} +(28,1,1) = {" aaa aaa aaa @@ -111698,8 +111319,6 @@ aaa aaa aaa aaa -"} -(29,1,1) = {" aaa aaa aaa @@ -111777,7 +111396,37 @@ aaa aaa aaa aaa +ops +bpo +brq +bpu +bms +bms +rNb +bpu +bms +bms +bpu +bms +bms +bpu +bms aaa +bNM +bPH +bSr +bTv +bXI +cgI +bNM +bkt +lvH +dSz +pVN +bpm +pVN +bmo +bpm aaa aaa aaa @@ -111799,42 +111448,6 @@ aaa aaa aaa aaa -bkt -bav -bnP -btk -nLK -btd -btd -bwF -bwK -byc -bCY -btd -bCX -bEE -btd -bIj -bJU -biX -bNP -bPL -bRB -bTD -bVR -bXJ -bZh -caX -boh -cgu -ccW -chW -qrT -jnD -bav -bnP -btk -brs aaa aaa aaa @@ -111937,6 +111550,8 @@ aaa aaa aaa aaa +"} +(29,1,1) = {" aaa aaa aaa @@ -111955,8 +111570,6 @@ aaa aaa aaa aaa -"} -(30,1,1) = {" aaa aaa aaa @@ -112040,6 +111653,95 @@ aaa aaa aaa aaa +bkt +bpo +brr +abj +abj +abj +btd +btd +btd +btd +btd +btd +btd +btd +btd +btd +bNM +bPO +bTc +bTw +bVL +chu +bNM +bku +boe +mRz +mRz +mRz +mRz +brp +cpb +brs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112056,42 +111758,6 @@ aaa aaa aaa aaa -bku -baE -bcA -bdZ -brs -btd -btd -bvC -bwJ -byd -bBf -btd -btd -bIk -naX -bwJ -bJV -bBf -bNM -bXI -bVS -bTE -bVS -bXI -oMr -caY -ccX -ceP -fmm -vDg -qrT -bkt -brT -bsb -btx -brs aaa aaa aaa @@ -112141,6 +111807,8 @@ aaa aaa aaa aaa +"} +(30,1,1) = {" aaa aaa aaa @@ -112212,8 +111880,6 @@ aaa aaa aaa aaa -"} -(31,1,1) = {" aaa aaa aaa @@ -112244,7 +111910,38 @@ aaa aaa aaa aaa +bku +bpo +brs +abj +abj +btd +btd +btd +bzv +btd +btd +btd +bvz +btd +bzv +btd +bNM +bPP +bUD +hzl +bXI +chE +bNM aaa +bpu +bms +bms +bpu +bms +bPC +bpo +brs aaa aaa aaa @@ -112294,7 +111991,6 @@ aaa aaa aaa aaa -lVg aaa aaa aaa @@ -112313,42 +112009,6 @@ aaa aaa aaa aaa -ops -bmr -cqM -bps -brr -btd -btd -btd -bCW -byd -bzA -bBf -bED -bBf -bBf -bIl -bip -bBf -bNM -bPJ -bRD -bTF -bVS -bXK -bNM -caV -ccX -fmm -fmm -chX -qrT -bku -cpd -cqM -csl -brs aaa aaa aaa @@ -112404,6 +112064,8 @@ aaa aaa aaa aaa +"} +(31,1,1) = {" aaa aaa aaa @@ -112469,8 +112131,6 @@ aaa aaa aaa aaa -"} -(32,1,1) = {" aaa aaa aaa @@ -112486,6 +112146,7 @@ aaa aaa aaa aaa +lVg aaa aaa aaa @@ -112506,7 +112167,38 @@ aaa aaa aaa aaa +ops +bpo +brs aaa +btd +btd +btd +bxX +bzw +btd +bCT +btd +bzw +bzD +bJR +btd +bNM +bPQ +bXm +bTI +bVN +cmx +bNM +qrT +qrT +qrT +qrT +qrT +abj +bku +bpo +brs aaa aaa aaa @@ -112570,41 +112262,7 @@ aaa aaa aaa aaa -abj -oMO -fPS -bJP -brs aaa -btd -bvz -bLQ -byf -bzB -bIm -bCZ -bIm -bIm -bIm -bJW -bwH -bNR -naT -bVT -bTG -bVT -bXL -bNM -qrT -bon -ceL -hng -qrT -qrT -bkt -bJP -orz -bpu aaa aaa aaa @@ -112663,6 +112321,8 @@ aaa aaa aaa aaa +"} +(32,1,1) = {" aaa aaa aaa @@ -112726,8 +112386,6 @@ aaa aaa aaa aaa -"} -(33,1,1) = {" aaa aaa aaa @@ -112766,6 +112424,39 @@ aaa aaa aaa aaa +bku +bpo +brr +abj +btd +btd +bwG +bxY +byg +bBd +bCU +bwG +bBf +bxY +bBf +tEw +bNM +bNM +bNM +bTz +bNM +bNM +bNM +qrT +qrT +qrT +qrT +qrT +qrT +bkt +bpo +brs +aaa aaa aaa aaa @@ -112829,38 +112520,6 @@ aaa aaa aaa aaa -bku -bJP -brr -abj -btd -btd -bwG -byg -bIn -bBd -bCU -bwG -bBf -bIn -bBf -uVE -bNM -bNM -bNM -bTH -bNM -bNM -bNM -qrT -qrT -qrT -qrT -qrT -qrT -bkt -bJP -brr aaa aaa aaa @@ -112919,6 +112578,12 @@ aaa aaa aaa aaa +"} +(33,1,1) = {" +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112983,8 +112648,6 @@ aaa aaa aaa aaa -"} -(34,1,1) = {" aaa aaa aaa @@ -113017,6 +112680,46 @@ aaa aaa aaa aaa +bmo +bnM +bpo +brs +aaa +btd +bvz +bLQ +bxZ +bzy +bIh +bCV +bIh +bIh +bIh +bJS +bwH +bNN +bPI +bVO +bTG +bVO +bPI +bNM +qrT +rSI +vzz +eaH +qrT +qrT +bkt +bpo +bLS +bmo +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113086,50 +112789,6 @@ aaa aaa aaa aaa -bkt -bJP -brs -aaa -btd -btd -btd -byh -bzD -btd -bDa -btd -bGq -bIo -bzw -btd -bNM -bPN -bVj -bTI -bVU -bPN -bNM -qrT -qrT -qrT -qrT -qrT -abj -bku -bJP -bLR -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -113176,6 +112835,8 @@ aaa aaa aaa aaa +"} +(34,1,1) = {" aaa aaa aaa @@ -113240,8 +112901,6 @@ aaa aaa aaa aaa -"} -(35,1,1) = {" aaa aaa aaa @@ -113277,6 +112936,42 @@ aaa aaa aaa aaa +bkt +bmp +cqK +bpq +brr +btd +btd +btd +bBg +bye +bzz +bBf +bEF +bBf +bBf +bgN +bJT +bLO +bNM +bPJ +bRz +bTB +bVS +bXH +bNM +caV +caW +fmm +fmm +chX +qrT +bku +bmq +cqK +csk +brs aaa aaa aaa @@ -113343,38 +113038,7 @@ aaa aaa aaa aaa -bkt -bJP -brs -abj -abj -btd -btd -btd -bzv -btd -btd -btd -bvz -btd -bzv -btd -bNM -bQC -bXI -bTL -bXI -bXM -bNM aaa -bpm -bmo -bmo -bpm -bmo -cnY -bJP -brr aaa aaa aaa @@ -113428,6 +113092,8 @@ aaa aaa aaa aaa +"} +(35,1,1) = {" aaa aaa aaa @@ -113497,8 +113163,6 @@ aaa aaa aaa aaa -"} -(36,1,1) = {" aaa aaa aaa @@ -113529,6 +113193,42 @@ aaa aaa aaa aaa +bku +bmq +bnO +bpq +brs +btd +btd +byg +bBf +bye +bBf +btd +btd +bIi +naX +bwJ +bhV +bNL +bNM +bSo +bVS +bTE +bVS +bXI +qrT +ccU +caW +ceP +fmm +fBl +qrT +bkt +bmq +cqL +bpq +brs aaa aaa aaa @@ -113600,38 +113300,6 @@ aaa aaa aaa aaa -bkt -bJP -brr -abj -abj -abj -btd -btd -btd -btd -btd -btd -btd -btd -btd -btd -bNM -bQD -bjE -bTK -bXI -bXN -bNM -bku -bJO -pDS -pDS -pDS -pDS -chS -cpe -brs aaa aaa aaa @@ -113681,6 +113349,8 @@ aaa aaa aaa aaa +"} +(36,1,1) = {" aaa aaa aaa @@ -113754,8 +113424,6 @@ aaa aaa aaa aaa -"} -(37,1,1) = {" aaa aaa aaa @@ -113782,6 +113450,42 @@ aaa aaa aaa aaa +bkt +bav +bnP +btk +nLK +btd +btd +bwF +bwK +byc +bCY +btd +bCX +bEE +btd +bIj +bJU +biX +bNP +bPL +bRB +bTD +bVR +bXJ +bZh +caX +boh +cgu +ccW +chW +qrT +jnD +bav +bnP +btk +brs aaa aaa aaa @@ -113857,37 +113561,7 @@ aaa aaa aaa aaa -bkt -bJP -brw -bpm -bmo -bmo -uDR -bpm -bmo -bmo -bpm -bmo -bmo -bpm -bmo aaa -bNM -bRt -bXI -bTL -bXI -bXO -bNM -bkt -eHx -orz -oMO -bpu -bms -bms -bms aaa aaa aaa @@ -113932,12 +113606,12 @@ aaa aaa aaa aaa +"} +(37,1,1) = {" aaa aaa aaa -acF aaa -acF aaa aaa aaa @@ -114011,8 +113685,6 @@ aaa aaa aaa aaa -"} -(38,1,1) = {" aaa aaa aaa @@ -114035,6 +113707,42 @@ aaa aaa aaa aaa +bku +baE +bcA +bdZ +brs +btd +btd +bvC +bwJ +byd +bBf +btd +btd +bIk +naX +bwJ +bJV +bBf +bNM +bXI +bVS +bTE +bVS +bXI +oMr +caY +ccX +ceP +fmm +vDg +qrT +bkt +brT +bsb +btx +brs aaa aaa aaa @@ -114079,7 +113787,9 @@ aaa aaa aaa aaa +acF aaa +acF aaa aaa aaa @@ -114114,32 +113824,6 @@ aaa aaa aaa aaa -bku -bJY -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -bJX -brs -bNM -bPN -czz -blG -bmS -bXP -bNM -bkt -bJP -brr aaa aaa aaa @@ -114179,6 +113863,8 @@ aaa aaa aaa aaa +"} +(38,1,1) = {" aaa aaa aaa @@ -114192,9 +113878,7 @@ aaa aaa aaa aaa -abj aaa -abj aaa aaa aaa @@ -114268,8 +113952,6 @@ aaa aaa aaa aaa -"} -(39,1,1) = {" aaa aaa aaa @@ -114282,6 +113964,42 @@ aaa aaa aaa aaa +ops +bmr +cqM +bps +brr +btd +btd +btd +bCW +byd +bzA +bBf +bED +bBf +bBf +bIl +bip +bBf +bNM +bPJ +bRD +bTF +bVS +bXK +bNM +caV +ccX +fmm +fmm +chX +qrT +bku +cpd +cqM +csl +brs aaa aaa aaa @@ -114326,7 +114044,9 @@ aaa aaa aaa aaa +abj aaa +abj aaa aaa aaa @@ -114371,32 +114091,6 @@ aaa aaa aaa aaa -abj -bpu -oMO -bms -bms -bms -bms -bms -bms -bms -bms -bms -bpu -fPS -bJP -bLR -bNM -bNM -bNM -bTM -bNM -bNM -bNM -bku -bJP -brs aaa aaa aaa @@ -114426,6 +114120,8 @@ aaa aaa aaa aaa +"} +(39,1,1) = {" aaa aaa aaa @@ -114448,11 +114144,7 @@ aaa aaa aaa aaa -abj -abj aaa -abj -abj aaa aaa aaa @@ -114525,13 +114217,45 @@ aaa aaa aaa aaa -"} -(40,1,1) = {" aaa aaa aaa aaa +abj +oMO +fPS +bJP +brs aaa +btd +bvz +bLQ +byf +bzB +bIm +bCZ +bIm +bIm +bIm +bJW +bwH +bNR +bPI +bVT +bTG +bVT +bXL +bNM +qrT +bon +ceL +hng +qrT +qrT +bkt +bJP +orz +bpu aaa aaa aaa @@ -114576,7 +114300,11 @@ aaa aaa aaa aaa +abj +abj aaa +abj +abj aaa aaa aaa @@ -114641,19 +114369,31 @@ aaa aaa aaa aaa -bku -bJP -bLS -wdm -bPR -bRJ -bTN -bVV -brw -bmo -bnM -bJP -brs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +"} +(40,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114704,13 +114444,6 @@ aaa aaa aaa aaa -abj -abj -dyo -dyn -dyo -abj -abj aaa aaa aaa @@ -114747,6 +114480,38 @@ aaa aaa aaa aaa +bku +bJP +brr +abj +btd +btd +bwG +byg +bIn +bBd +bCU +bwG +bBf +bIn +bBf +uVE +bNM +bNM +bNM +bTH +bNM +bNM +bNM +qrT +qrT +qrT +qrT +qrT +qrT +bkt +bJP +brr aaa aaa aaa @@ -114782,8 +114547,6 @@ aaa aaa aaa aaa -"} -(41,1,1) = {" aaa aaa aaa @@ -114793,6 +114556,13 @@ aaa aaa aaa aaa +abj +abj +dyo +dyn +dyo +abj +abj aaa aaa aaa @@ -114864,6 +114634,8 @@ aaa aaa aaa aaa +"} +(41,1,1) = {" aaa aaa aaa @@ -114898,19 +114670,6 @@ aaa aaa aaa aaa -bkt -bJY -bLT -chS -chS -bVW -bTO -bVW -chS -chS -chS -cpe -brs aaa aaa aaa @@ -114960,15 +114719,6 @@ aaa aaa aaa aaa -abj -abj -dyn -dyo -dCy -dyo -dyn -abj -abj aaa aaa aaa @@ -114987,7 +114737,38 @@ aaa aaa aaa aaa +bkt +bJP +brs aaa +btd +btd +btd +byh +bzD +btd +bDa +btd +bGq +bIo +bzw +btd +bNM +bPN +bVj +bTI +bVU +bPN +bNM +qrT +qrT +qrT +qrT +qrT +abj +bku +bJP +bLR aaa aaa aaa @@ -115031,6 +114812,15 @@ aaa aaa aaa aaa +abj +abj +dyn +dyo +dCy +dyo +dyn +abj +abj aaa aaa aaa @@ -115039,8 +114829,6 @@ aaa aaa aaa aaa -"} -(42,1,1) = {" aaa aaa aaa @@ -115103,6 +114891,8 @@ aaa aaa aaa aaa +"} +(42,1,1) = {" aaa aaa aaa @@ -115156,18 +114946,6 @@ aaa aaa aaa aaa -fPS -bLU -bLM -bPC -bmq -bTS -bpq -brq -oMO -bpu -oMO -abj aaa aaa aaa @@ -115216,23 +114994,38 @@ aaa aaa aaa aaa +bkt +bJP +brs abj abj -dyo -dyo -dBE -dCz -dEc -dyo -dyo -abj -abj -aaa -aaa -aaa -aaa -aaa +btd +btd +btd +bzv +btd +btd +btd +bvz +btd +bzv +btd +bNM +bQC +bXI +bTL +bXI +bXM +bNM aaa +bpm +bmo +bmo +bpm +bmo +cnY +bJP +brr aaa aaa aaa @@ -115275,6 +115068,17 @@ aaa aaa aaa aaa +abj +abj +dyo +dyo +dBE +dCz +dEc +dyo +dyo +abj +abj aaa aaa aaa @@ -115296,8 +115100,6 @@ aaa aaa aaa aaa -"} -(43,1,1) = {" aaa aaa aaa @@ -115346,6 +115148,8 @@ aaa aaa aaa aaa +"} +(43,1,1) = {" aaa aaa aaa @@ -115413,14 +115217,6 @@ aaa aaa aaa aaa -bku -bLV -brr -bku -bRL -bTQ -bmY -brr aaa aaa aaa @@ -115455,6 +115251,38 @@ aaa aaa aaa aaa +bkt +bJP +brr +abj +abj +abj +btd +btd +btd +btd +btd +btd +btd +btd +btd +btd +bNM +bQD +bjE +bTK +bXI +bXN +bNM +bku +bJO +pDS +pDS +pDS +pDS +chS +cpe +brs aaa aaa aaa @@ -115471,21 +115299,6 @@ aaa aaa aaa aaa -acF -abj -abj -dyn -dyn -dAY -dBF -dAH -dEv -dFU -dyn -dyn -abj -abj -acF aaa aaa aaa @@ -115510,6 +115323,21 @@ aaa aaa aaa aaa +acF +abj +abj +dyn +dyn +dAY +dBF +dAH +dEv +dFU +dyn +dyn +abj +abj +acF aaa aaa aaa @@ -115553,8 +115381,6 @@ aaa aaa aaa aaa -"} -(44,1,1) = {" aaa aaa aaa @@ -115579,6 +115405,8 @@ aaa aaa aaa aaa +"} +(44,1,1) = {" aaa aaa aaa @@ -115671,13 +115499,7 @@ aaa aaa aaa aaa -bUJ aaa -bku -bmq -bTR -bpq -brr aaa aaa aaa @@ -115686,7 +115508,37 @@ aaa aaa aaa aaa +bkt +bJP +brw +bpm +bmo +bmo +uDR +bpm +bmo +bmo +bpm +bmo +bmo +bpm +bmo aaa +bNM +bRt +bXI +bTL +bXI +bXO +bNM +bkt +eHx +orz +oMO +bpu +bms +bms +bms aaa aaa aaa @@ -115884,15 +115736,6 @@ aaa aaa aaa aaa -aaZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -115922,18 +115765,31 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -bUJ -aaa bku -bmq -bTS -bpq +bJY +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +bJX +brs +bNM +bPN +czz +blG +bmS +bXP +bNM +bkt +bJP brr aaa aaa @@ -115981,10 +115837,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa acF abj abj @@ -116170,32 +116022,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bUJ abj -bPS -bRM -bTT -bVX -bPS -aaa -aaa -aaa -aaa +bpu +oMO +bms +bms +bms +bms +bms +bms +bms +bms +bms +bpu +fPS +bJP +bLR +bNM +bNM +bNM +bTM +bNM +bNM +bNM +bku +bJP +brs aaa aaa aaa @@ -116440,19 +116292,19 @@ aaa aaa aaa aaa -aaa -aaa -bUJ -aaa bku -bRN -bTU -bVY -brr -aaa -aaa -aaa -aaa +bJP +bLS +wdm +bPR +bRJ +bTN +bVV +brw +bmo +bnM +bJP +brs aaa aaa aaa @@ -116655,6 +116507,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -116696,20 +116549,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -bUJ -aaa -bPU -bms -bZw -bms -bXR -aaa -aaa -aaa -aaa +bkt +bJY +bLT +chS +chS +bVW +bTO +bVW +chS +chS +chS +cpe +brs aaa aaa aaa @@ -116955,18 +116807,18 @@ aaa aaa aaa aaa -aaa -bUJ -abj -bPV -abj -chw +fPS +bLU +bLM +bPC +bmq +bTS +bpq +brq +oMO +bpu +oMO abj -bPV -aaa -aaa -aaa -aaa aaa aaa aaa @@ -117212,14 +117064,14 @@ aaa aaa aaa aaa -aaa -bUJ -aaa -bPW -wXe -chw -wXe -bXS +bku +bLV +brr +bku +bRL +bTQ +bmY +brr aaa aaa aaa @@ -117472,11 +117324,11 @@ aaa aaa bUJ aaa -abj -bRQ -chw -bWb -abj +bku +bmq +bTR +bpq +brr aaa aaa aaa @@ -117729,12 +117581,11 @@ aaa aaa bUJ aaa -abj -wXe -cnH -wXe -abj -aaa +bku +bmq +bTS +bpq +brr aaa aaa aaa @@ -117756,6 +117607,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -117928,7 +117780,6 @@ aaa aaa aaa aaa -aaZ aaa aaa aaa @@ -117984,13 +117835,14 @@ aaa aaa aaa aaa -aJU -aMK -bYl -aaa -csr aaa +bUJ abj +bPS +bRM +bTT +bVX +bPS aaa aaa aaa @@ -118185,6 +118037,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -118230,8 +118083,6 @@ aaa aaa aaa aaa -aaZ -aaa aaa aaa aaa @@ -118241,13 +118092,14 @@ aaa aaa aaa aaa -abj aaa bUJ aaa -csr -aaa -abj +bku +bRN +bTU +bVY +brr aaa aaa aaa @@ -118448,13 +118300,6 @@ aaa aaa aaa aaa -tQK -abj -tQK -abj -tQK -tQK -tQK aaa aaa aaa @@ -118498,13 +118343,20 @@ aaa aaa aaa aaa -abj -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa bUJ -abj -coi -abj -abj +aaa +bPU +bms +bZw +bms +bXR aaa aaa aaa @@ -118701,21 +118553,17 @@ aaa aaa aaa aaa -tQK -tQK -aGW -tQK -tQK aaa -abj aaa -abj aaa -tQK -tQK +aaa +dij abj -tQK -tQK +dij +abj +dij +dij +dij aaa aaa aaa @@ -118755,13 +118603,17 @@ aaa aaa aaa aaa -abj aaa -bUJ aaa -csr aaa +aaa +bUJ +abj +bPV abj +chw +abj +bPV aaa aaa aaa @@ -118958,22 +118810,21 @@ aaa aaa aaa aaa -tQK -aaa -abj +dij +dij +aGW +dij +dij aaa abj aaa -ash -asV -atY -aaa abj aaa +dij +dij abj -aaa -tQK -aaa +dij +dij aaa aaa aaa @@ -119012,13 +118863,14 @@ aaa aaa aaa aaa -abj aaa bUJ aaa -csr -aaa -abj +bPW +wXe +chw +wXe +bXS aaa aaa aaa @@ -119215,15 +119067,11 @@ aaa aaa aaa aaa -tQK +dij aaa -ash -asV -atY +abj aaa -ash -ata -atY +abj aaa ash asV @@ -119231,6 +119079,10 @@ atY aaa abj aaa +abj +aaa +dij +aaa aaa aaa aaa @@ -119269,12 +119121,12 @@ aaa aaa aaa aaa -abj -abj bUJ +aaa abj -coi -abj +bRQ +chw +bWb abj aaa aaa @@ -119472,10 +119324,10 @@ aaa aaa aaa aaa -abj +dij aaa ash -ata +asV atY aaa ash @@ -119483,10 +119335,10 @@ ata atY aaa ash -ata +asV atY aaa -tQK +abj aaa aaa aaa @@ -119525,13 +119377,13 @@ aaa aaa aaa aaa -aaZ -abj aaa bUJ aaa -csr -aaa +abj +wXe +cnH +wXe abj aaa aaa @@ -119543,7 +119395,7 @@ aaa aaa aaa aaa -aaZ +aaa aaa aaa aaa @@ -119729,21 +119581,21 @@ aaa aaa aaa aaa -tQK abj +aaa ash ata atY -abj +aaa ash ata atY -abj +aaa ash ata atY -abj -tQK +aaa +dij aaa aaa aaa @@ -119783,12 +119635,12 @@ aaa aaa aaa aaa +bVf +bXG +bYl abj +coi abj -bUJ -aaa -csr -aaa abj aaa aaa @@ -119810,7 +119662,7 @@ aaa aaa aaa aaa -dmq +aaa dmq dmq cHA @@ -119986,21 +119838,22 @@ aaa aaa aaa aaa -tQK -aaa +dij +abj ash ata atY -aaa +abj ash ata atY -aaa +abj ash ata atY -aaa abj +dij +aaa aaa aaa aaa @@ -120041,7 +119894,6 @@ aaa aaa aaa aaa -abj bUJ abj coi @@ -120240,18 +120092,18 @@ aaa aaa aaa aaa -tQK -abj -tQK -tQK +aaa +aaa +aaa +dij aaa ash ata atY aaa -abj -atb -abj +ash +ata +atY aaa ash ata @@ -120297,8 +120149,8 @@ aaa aaa aaa aaa -tQK -abj +aaa +aaa bUJ aaa csr @@ -120497,23 +120349,23 @@ aaa aaa aaa aaa -tQK -aaa -abj -abj -abj -abj -atb -abj -abj -abj -atZ -abj +dij abj +dij +dij +aaa +ash +ata +atY +aaa abj atb abj -abj +aaa +ash +ata +atY +aaa abj aaa aaa @@ -120554,7 +120406,7 @@ abj acF acF acF -tQK +dij aaa bUJ aaa @@ -120754,29 +120606,29 @@ aaa aaa aaa aaa -tQK +dij +aaa +abj +abj +abj +abj +atb +abj +abj abj -apF -aEc -aEc -aEc -atc -atZ -atZ -atZ -atZ -atZ -atZ -atZ -atZ -aEb -aEc -aEc -aEc -atc -atZ -atZ atZ +abj +abj +abj +atb +abj +abj +abj +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121011,29 +120863,29 @@ aaa aaa aaa aaa -tQK -aaa -abj -abj -abj -abj -atK -abj -abj +dij abj +apF +aEc +aEc +aEc +atc +atZ +atZ +atZ +atZ +atZ +atZ +atZ +atZ +aEb +aEc +aEc +aEc +atc +atZ +atZ atZ -abj -abj -abj -atK -abj -abj -abj -abj -abj -abj -abj -mxG aaa aaa aaa @@ -121068,7 +120920,7 @@ bzE bzE bwN acF -tQK +dij aaa bUJ aaa @@ -121268,28 +121120,28 @@ aaa aaa aaa aaa -tQK -tQK +dij +aaa +abj abj abj -aaa -ash -atL -atY -aaa abj atK abj -aaa -ash -atL -atY -aaa abj -aaa abj -aaa -aaa +atZ +abj +abj +abj +atK +abj +abj +abj +abj +abj +abj +abj atZ aaa aaa @@ -121325,7 +121177,7 @@ bEG bGB bwN abj -tQK +dij aaa bUJ aaa @@ -121525,24 +121377,24 @@ aaa aaa aaa aaa -aaa -aaa -aaa -tQK +dij +dij +abj +abj aaa ash atL atY aaa -ash -atL -atY +abj +atK +abj aaa ash atL atY aaa -tQK +abj aaa abj aaa @@ -121785,26 +121637,26 @@ aaa aaa aaa aaa -tQK +dij aaa ash atL atY -abj +aaa ash atL atY -abj +aaa ash atL atY -dKA -tQK -abj +aaa +dij +aaa abj aaa aaa -atZ +atK abj aLT aNT @@ -121839,7 +121691,7 @@ bBi bzE bwN abj -tQK +dij aaa bUJ aaa @@ -122042,22 +121894,22 @@ aaa aaa aaa aaa -tQK +dij aaa ash atL atY -aaa +abj ash atL atY -aaa +abj ash atL atY -aaa -tQK -aaa +dKA +dij +abj abj abj aGX @@ -122299,10 +122151,10 @@ aaa aaa aaa aaa -abj +dij aaa ash -atU +atL atY aaa ash @@ -122310,10 +122162,10 @@ atL atY aaa ash -atU +atL atY aaa -abj +dij aaa abj abj @@ -122552,13 +122404,9 @@ aaa aaa aaa aaa -aaZ -aaa aaa aaa -tQK aaa -abj aaa abj aaa @@ -122566,12 +122414,16 @@ ash atU atY aaa -abj +ash +atL +atY aaa -abj +ash +atU +atY aaa -tQK abj +aaa abj aGX aGX @@ -122809,27 +122661,27 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa +dij aaa -tQK -tQK -aGW -tQK abj aaa abj aaa -abj +ash +atU +atY aaa abj -tQK -aGW -tQK -tQK +aaa abj aaa +dij +abj +abj aGY aIq upI @@ -123060,8 +122912,6 @@ aaa aaa aaa aaa -aaZ -aaa aaa aaa aaa @@ -123072,19 +122922,21 @@ aaa aaa aaa aaa +dij +dij +aGW +dij +abj aaa -tQK -tQK -tQK -tQK -tQK -tQK -tQK -tQK -tQK abj +aaa abj +aaa abj +dij +aGW +dij +dij abj aaa aGY @@ -123330,19 +123182,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dij +dij +dij +dij +dij +dij +dij +dij +dij +abj +abj +abj +abj aaa aGY aIs @@ -123588,19 +123440,19 @@ aaa aaa aaa aaa +abj +abj +abj aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aAe +aBV +aAe +aBV +aAe +aBV +aAe +aJy +aBV aGY aGY aLr @@ -123687,7 +123539,7 @@ dcM daf lTi dhv -lYq +duT dYm lTi dmM @@ -123831,6 +123683,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -123844,20 +123697,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aAe -aBV -aAe -aBV -aAe -aBV -aAe -aJy -aBV +dij +abj +abj +abj +aAi +ayG +azR +ayG +aAi +ayG +azR +aIT +aEa leZ aIt aMO @@ -124102,19 +123954,19 @@ aaa aaa aaa aaa -aaa -tQK -aaa +dij +abj +abj aaa aAi -ayG -azR -ayG aAi -ayG -azR -aIT -aEa +aAi +aAi +aAi +aAi +aAi +aDC +aBV aHa aIu aJN @@ -124359,19 +124211,19 @@ aaa aaa aaa aaa -aaa +dij +abj abj abj -aaa -aAi -aAi -aAi -aAi -aAi aAi +ayG +ayG +ayG aAi -aDC -aBV +ayG +ayG +aIT +aEa leZ aIv aJO @@ -124615,26 +124467,26 @@ aaa aaa aaa aaa -aaa +abj abj abj abj abj aAi -ayG -ayG -ayG -aAi -ayG -ayG -aIT +aDC aEa +aDC +aEa +aDC +aEa +aDC +aBV leZ aIw aJO aLf aMG -aOg +aOb aOb aOb aOg @@ -124871,22 +124723,22 @@ aaa aaa aaa aaa -aaa -aaa -tQK abj +dij abj -aaa -aAi -vOo -aEa -aDC -aEa -aDC -aEa -aDC -aBV -aHa +atd +atd +eKj +aCd +eKj +eKj +atd +atd +eKj +eKj +eKj +aCd +leZ aIx aJO eQe @@ -125129,28 +124981,28 @@ aaa aaa aaa aaa -aaa -tQK -atd -atd -atd -fjw -eKj -eKj -atd +abj +dij atd -eKj -eKj -eKj -bmf -leZ -aIy -gJL -pNz +avx +wqp +ePt +rAC +rAC +ocA +pJw +nUR +nUR +rAC +vVB +aHa +aIz +aJR +hgs mPY jmi xqG -aQT +kaq aSA aTW aVD @@ -125386,28 +125238,28 @@ aaa aaa aaa aaa -aaa -tQK +abj +dij atd -wQE -qdE -lWo -aIH -aIH +mPO +aFd axI -uYk -aEf -aEf -tEe -pJf -leZ -aIz -aJR -hgs +aFd +kuJ +tUw +sQZ +bnK +dFZ +aFd +jqX +atd +lWo +oql +hLA hxO aOb -aQT -kaq +iqR +brz pxC hEc aVE @@ -125643,28 +125495,28 @@ aaa aaa aaa aaa -aaa +abj abj atd -uJs -uQW -aDe -uQW -oKV -tUw -ePt -jqX -aFd +oAP uQW -aCd +uMY +ayT +kJd +ufU +iyC +ayO +aJF +waQ +aMJ +pSJ leZ -aIA -aEd -hLA +aJS +hgs pih -izz +aOg nPe -brz +aQW aSD ePS aVF @@ -125900,28 +125752,28 @@ aaa aaa aaa aaa -tQK +dij abj atd -avx +aCV uQW -aDe +aCi uQW -hZW -wwE -kuJ -aDe -aDe +eFV +oCV +gBo uQW -aCd -leZ +onA +izz +qEN +uJs leZ leZ vHD -aMJ +leZ aOg -kXZ -aQW +aPz +aQT aSE gsz aVG @@ -125956,7 +125808,7 @@ bOe bUl bRZ bUl -syc +axK bXU fEo cbi @@ -126043,13 +125895,13 @@ aaa aaa aaa aaa -tQK -tQK -tQK +dij +dij +dij abj sso -tQK -tQK +dij +dij aaa aaa aaa @@ -126156,23 +126008,23 @@ aaa aaa aaa aaa -abj -abj +aaa +dij abj axl -ker +avI awI -tep -ayJ +avE +hwu kur -aEm -age -mTu -tYw -aCi +hwu +kur +hwu +kur +hwu gba -aGd -aAg +aJH +qWG lZR aLs aML @@ -126296,21 +126148,21 @@ aaa aaa aaa aaa -tQK +dij abj abj -tQK -tQK +dij +dij aaa aaa abj aaa aaa -tQK -tQK +dij +dij sso -tQK -tQK +dij +dij aaa aaa aaa @@ -126413,29 +126265,29 @@ aaa aaa aaa aaa -tQK aaa +raB aaa axl avI -oql +dFi axJ aCp ayV -aHc aCS +aCS +aDe +aHc +aHc uly -uNZ -nbG -sQZ -aJF +fhC aID kAG aLu aMM aOj aUM -aDh +tzp aSD uQB aVF @@ -126553,7 +126405,7 @@ aaa aaa aaa aaa -tQK +dij aaa aaa abj @@ -126567,7 +126419,7 @@ aaa abj aaa aaa -tQK +dij aaa aaa aaa @@ -126670,26 +126522,26 @@ aaa aaa aaa aaa -raB aaa +raB aaa axl avI -awP +hwu axL ayL azT -qEN +uBp azT ayP -aFl -ayR +aCj +aDf aFe -aJH +aHh aID aCk -ocA -tzp +oKV +uYk aOg mMM aQT @@ -126810,7 +126662,7 @@ aaa aaa aaa aaa -tQK +dij aaa dTV dYL @@ -126861,23 +126713,39 @@ aaa aaa aaa aaa -"} -(88,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(88,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -126912,38 +126780,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -tQK -abj +dij aaa auG avC -fCZ -nWY +kur +axM ayM aAd -aAa +aAd aAd raH -aFl -fNS +aCj +aEf aFf aHl -fXC +aIE atd aLp atd @@ -126962,7 +126814,7 @@ aXo aXo bhl biR -jtK +bkM bmB bnX tkz @@ -127081,7 +126933,7 @@ dTV dYM dVn aaa -tQK +dij aaa aaa aaa @@ -127110,7 +126962,7 @@ aaa aaa aaa aaa -rkU +abj aaa aaa aaa @@ -127184,23 +127036,23 @@ aaa aaa aaa aaa -tQK -abj +aaa +dij abj atd aLu -qhe -iGO +iVF +axO ayM pyQ -uBp +mxG sqD ksd ayM aFg wBz aHh -fXC +aIF atd wgY eMw @@ -127219,7 +127071,7 @@ oHi aOb bhk tBD -jtK +bkM bmC aYK bpH @@ -127338,7 +127190,7 @@ dTV dYM dVn abj -tQK +dij aaa aaa aaa @@ -127367,7 +127219,7 @@ aaa aaa aaa aaa -hwq +sso aaa aaa aaa @@ -127441,14 +127293,14 @@ aaa aaa aaa aaa -abj aaa +abj aaa -lqL -awP -awP -bmJ -ayO +vOo +hwu +hwu +axP +uUh azZ azZ azZ @@ -127457,7 +127309,7 @@ upc pcM aJs aHl -gdE +aIG aJV lSE xCp @@ -127476,7 +127328,7 @@ beM bgf bhn biS -jtK +bkM bmD bnY bpI @@ -127581,7 +127433,7 @@ aaa aaa aaa aaa -tQK +dij aaa dTV dYM @@ -127623,9 +127475,9 @@ aaa aaa aaa aaa -rkU -dTB -rkU +abj +fOs +abj aaa aaa aaa @@ -127687,202 +127539,202 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abj -aaa -aaa -lqL -lNO -lNO -nUm -ayO -aAa -aBX -aAa -mxm -aAa -aCZ -rZo -aCj -hjH -aJZ -glw -sfh -aOm -aTT -aDh -aSD -qYd -aVI -aOb -sHf -bas -bbT -bds -dOB -aOb -bhk -aZm -jtK -bmE -bnZ -bpJ -brJ -btn -bux -aOg -byl -byl -byl -nEp -uCF -bEX -bGE -bEX -bKp -pWA -bGz -bGz -bWq -bGz -bGz -bXU -cbu -cbn -cqX -cfc -bWK -bWK -bWK -bWK -bWK -nFa -nWg -cqX -bWK -bWK -bWK -bWK -bWK -bWK -cCe -cCo -cDH -qIe -seN -cHr -dtU -dlM -dmq -dmq -dmq -dmq -dmq -dmq -dmq -dmq -dmq -drn -qHY -dbL -dbZ -deJ -dfS -dov -gLk -dky -dbM -dmS -dYx -dYo -wnI -drl -dpS -dtQ -bDp -abj -aaa -acF -abj -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -tQK -tQK -aaa -tQK -tQK -aaa -tQK -aaa -dTV -dYM -dVn -aaa -abj -dYN -abj -aaa -dTV -dYM -dVn -aaa -abj -tQK -tQK -tQK -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -hwq -dTB -hwq -dTB +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aaa +sdI +qhe +qhe +aPy +uUh +aAa +lqL +aAa +mxm +aAa +aCZ +rZo +aGi +aIH +aJZ +glw +sfh +aOm +aTT +tQK +aJU +cwX +aVI +aOb +sHf +bas +bbT +bds +dOB +aOb +bhk +aZm +bkM +bmE +bnZ +bpJ +brJ +btn +bux +aOg +byl +byl +byl +nEp +uCF +bEX +bGE +bEX +bKp +pWA +bGz +bGz +bWq +bGz +bGz +bXU +cbu +cbn +cqX +cfc +bWK +bWK +bWK +bWK +bWK +nFa +nWg +cqX +bWK +bWK +bWK +bWK +bWK +bWK +cCe +cCo +cDH +qIe +seN +cHr +dtU +dlM +dmq +dmq +dmq +dmq +dmq +dmq +dmq +dmq +dmq +drn +qHY +dbL +dbZ +deJ +dfS +dov +gLk +dky +dbM +dmS +dYx +dYo +wnI +drl +dpS +dtQ +bDp +abj +aaa +acF +abj +aaa +abj +aaa +aaa +aaa +aaa +aaa +aaa +acF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +dij +dij +aaa +dij +dij +aaa +dij +aaa +dTV +dYM +dVn +aaa +abj +dYN +abj +aaa +dTV +dYM +dVn +aaa +abj +dij +dij +dij +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +raB +fOs +sso +fOs aaa aaa aaa @@ -127955,22 +127807,22 @@ aaa aaa aaa aaa -abj aaa +abj aaa -lqL -awP -awP +vOo +hwu +hwu axP -ayO +uUh aAb aAb aAb duJ -upc +pYc pcM gwO -aHl +wQE iZL lZR stW @@ -128089,7 +127941,7 @@ aaa abj abj abj -tQK +dij abj abj abj @@ -128112,7 +127964,7 @@ aaa aaa abj aaa -tQK +dij aaa aaa aaa @@ -128136,11 +127988,11 @@ aaa aaa aaa aaa -rkU -dTB -rkU -rkU -rkU +abj +fOs +abj +abj +abj aaa aaa aaa @@ -128212,12 +128064,12 @@ aaa aaa aaa aaa -tQK -abj +aaa +dij abj atd aLs -hwu +lNO axS ayM oHg @@ -128227,16 +128079,16 @@ nDt ayM ayM oVs -aGi -aID +aHh +eEd atd jMo rbo aOg aPG -jhG -aSH -cwX +aQT +aSD +kaO aVI aXq bbR @@ -128346,7 +128198,7 @@ abj acF aaa aaa -tQK +dij abj aaa dQB @@ -128394,8 +128246,8 @@ aaa aaa aaa aaa -rkU -dTB +abj +fOs aaa aaa aaa @@ -128469,23 +128321,23 @@ aaa aaa aaa aaa +aaa raB abj -aaa auG avC -fCZ +kur axN ayM aAd aAd aAd raH -axW -bVf +aDc +aEj aGa aHl -rme +oan atd atd atd @@ -128626,7 +128478,7 @@ aaa aaa abj aaa -tQK +dij aaa aaa aaa @@ -128726,23 +128578,23 @@ aaa aaa aaa aaa -sso aaa +dij aaa axl avI -awP -fhC +hwu +axL ayP aBf aBf aBf ayL -axW -bVf +aDc +aEj aFi aHm -ycN +oeZ aJY aLv kNF @@ -128761,7 +128613,7 @@ aXN ijT mzZ ban -jtK +bkM bmI wkD wkD @@ -128860,13 +128712,13 @@ abj acF aaa aaa -tQK +dij abj aaa dYI aaa aaa -tQK +dij aaa dTV dYO @@ -128881,9 +128733,9 @@ dYO dVn aaa abj -tQK -tQK -tQK +dij +dij +dij aaa aaa aaa @@ -128983,23 +128835,23 @@ aaa aaa aaa aaa -tQK aaa +dij aaa axl avI -uMY -qFY -azU -axK -rfH -rfH -pJw -aEj -aEj -oAP -aiE -aVS +hZW +nbG +ayI +azV +aCU +aCU +aEe +aFV +aFV +dEE +hox +tep oox aLw pJP @@ -129018,7 +128870,7 @@ tiC bgg ban ban -jtK +bkM mtt wkD sgF @@ -129117,13 +128969,13 @@ aaa abj abj abj -tQK +dij abj aaa dYJ aaa aaa -tQK +dij aaa dTV dYO @@ -129240,23 +129092,23 @@ aaa aaa aaa aaa -tQK -aaa aaa +dij +abj axl -avI -pYc -ewv -awP -fCZ -awP -fCZ -axP -aDc -axP -fCZ -kaO -ajx +aLu +cJs +axV +ayR +aAg +ayR +aAg +aDd +aEm +aFj +rfH +mZv +aMM kzE nRx oHK @@ -129369,9 +129221,9 @@ aaa abj aaa aaa -tQK -tQK -tQK +dij +dij +dij abj abj abj @@ -129380,7 +129232,7 @@ aaa dYJ abj aaa -tQK +dij abj dTV dYO @@ -129394,7 +129246,7 @@ dTV dYO dVn abj -tQK +dij aaa aaa aaa @@ -129497,28 +129349,28 @@ aaa aaa aaa aaa -tQK -aaa aaa +dij +abj +atd atd aLu -aJS -aDe -uQW -uQW -uQW -uQW -aDe -aDe -aDe -uQW -hox -wzM +bai +ayK +azW +aCW +aCW +aEl +ygd +exZ +aHp +aMM +gBF auK -nks +qaS aes aOl -aOg +aPH aQT aSK aUg @@ -129637,7 +129489,7 @@ dPp pkj dPp abj -tQK +dij aaa dTV dYO @@ -129651,7 +129503,7 @@ dTV dYO dVn aaa -tQK +dij aaa aaa aaa @@ -129754,29 +129606,29 @@ aaa aaa aaa aaa -tQK -aaa +abj +abj +abj aaa atd atd -aLu -axV -ayK -azW -uQW -uQW -aEl -ygd -exZ -uQW -xzF -aID +aBX +rwj +kqp +rfT +jhG +fpf +qOQ +vHB +aGc +aJG +atd +atd atd -wAp atd aOg aOg -aQT +aHG aSL aUh aPH @@ -129879,14 +129731,14 @@ abj abj abj abj -tQK -tQK -tQK -tQK -tQK +dij +dij +dij +dij +dij abj -tQK -tQK +dij +dij abj aaa abj @@ -129908,7 +129760,7 @@ dTV dYP dVn aaa -tQK +dij aaa aaa aaa @@ -130011,25 +129863,25 @@ aaa aaa aaa aaa -tQK aaa +abj +fOs aaa aaa atd +axl +dLX +dLX +atd +aCk +iGI +ths +ths +atd atd -bai -hEn -gBo -waQ -pSJ -fpf -qOQ -vHB -aGc -aJD -gBF atd aaa +abj aaa aaa aOg @@ -130165,7 +130017,7 @@ aaa abj aaa aaa -tQK +dij aaa aaa aaa @@ -130268,28 +130120,28 @@ aaa aaa aaa aaa +aaa abj aaa aaa aaa aaa -atd -atd -dLX -dLX -atd -aCk -iGI -ths -ths -atd -atd -atd -atd +aaa +hEn +hEn +aaa +aaa +tEe +aaa +aaa +aaa aaa aaa aaa abj +aaa +aaa +abj inh wRk baN @@ -130392,14 +130244,14 @@ abj abj abj abj -tQK -tQK -tQK -tQK +dij +dij +dij +dij abj -tQK -tQK -tQK +dij +dij +dij aaa abj aaa @@ -130410,8 +130262,8 @@ dRo dPq aaa aaa -tQK -tQK +dij +dij aaa aaa aaa @@ -130419,10 +130271,10 @@ abj aaa aaa sso -tQK -tQK +dij +dij sso -tQK +dij aaa aaa aaa @@ -130524,19 +130376,19 @@ aaa aaa aaa aaa -abj -abj -abj -abj -abj -abj aaa aaa -aHG -aHG +dij aaa aaa -aOW +aaa +aaa +aaa +hEn +hEn +aaa +aaa +tEe aaa aaa aaa @@ -130670,11 +130522,11 @@ aaa aaa sso aaa -tQK -tQK +dij +dij abj -tQK -tQK +dij +dij sso aaa aaa @@ -130780,7 +130632,7 @@ aaa aaa aaa abj -abj +aaa abj aaa abj @@ -131544,7 +131396,7 @@ aaa aaa aaa aaa -uud +aaa aaa aaa aaa @@ -131801,7 +131653,7 @@ aaa aaa aaa aaa -uud +aaa aaa aaa aaa @@ -132058,7 +131910,7 @@ aaa aaa aaa aaa -fZy +aaa aaa aaa aaa @@ -132292,6 +132144,7 @@ aaa aaa aaa aaa +aaa knM aaa aaa @@ -132315,7 +132168,6 @@ aaa aaa aaa aaa -uud aaa aaa aaa @@ -132547,12 +132399,13 @@ aaa aaa aaa aaa +aaa acC aef aef acC -abj -abj +qdE +qdE abj abj abj @@ -132572,7 +132425,6 @@ adb abj abj abj -xNL abj abj abj @@ -132803,20 +132655,21 @@ aaa aaa aaa aaa +aaa abj acC afb afb acC +aMK +aMK +wXe +rkU aaa aaa aaa -abj -aaa -aaa -aaa -aaa -abj +wXe +qdE acC acC acC @@ -132829,7 +132682,6 @@ acC aaa aaa aaa -xNL aaa aaa aaa @@ -133058,6 +132910,7 @@ aaa aaa aaa aaa +aaa adb acC adb @@ -133086,7 +132939,6 @@ acC adb acC adb -pYn adb adb adb @@ -133316,6 +133168,7 @@ aaa acC acC acC +acC afb tXb adZ @@ -133327,7 +133180,7 @@ adZ afJ adZ adZ -agd +age aip adZ adZ @@ -133340,10 +133193,9 @@ adZ adZ aip adZ -kJd +pOi adZ -qdk -wQS +mTu amL bKz wSO @@ -133571,6 +133423,7 @@ aaa aaa aaa nXF +nXF pUC rtH vsW @@ -133600,7 +133453,6 @@ uks uks uks nyB -oCV gQF rUl gEs @@ -133830,6 +133682,7 @@ aaa acC acC acC +acC adu sMV aeb @@ -133841,7 +133694,7 @@ aeb eCj aeb aeb -ltw +aiE agB aeb aeb @@ -133857,7 +133710,6 @@ aeb mFy aeb reW -pOi amL ant anP @@ -134086,6 +133938,7 @@ aaa aaa aaa aaa +aaa adb acC adb @@ -134115,7 +133968,6 @@ adb acC adb adb -adb sgZ qpo adb @@ -134345,30 +134197,30 @@ aaa aaa aaa aaa +wXe abj -abj -aaa -aaa -aaa -abj +rkU aaa aaa +wXe +rkU aaa aaa -abj aaa +wXe +rkU aaa -abj -acC +wXe +qdE acC acC acC acC acC -abj -aaa -abj -aaa +aIA +rkU +wXe +rkU aaa aaa aaa @@ -134603,7 +134455,7 @@ aaa aaa aaa aaa -abj +wXe abj abj abj @@ -134863,11 +134715,10 @@ aaa aaa aaa aaa -acF -aaa -abj -aaa -aaa +wXe +aIy +wXe +rkU aaa aaa aaa @@ -134884,8 +134735,9 @@ aaa aaa aaa aaa -abj aaa +wXe +rkU acC ant anP @@ -135120,11 +134972,10 @@ aaa aaa aaa aaa -acF -aaa -abj -aaa -aaa +wXe +aIy +wXe +rkU aaa aaa aaa @@ -135141,8 +134992,9 @@ aaa aaa aaa aaa -abj aaa +wXe +rkU acC ant jTD @@ -135377,11 +135229,10 @@ aaa aaa aaa aaa -acF -aaa -abj -aaa -aaa +wXe +aIy +wXe +rkU aaa aaa aaa @@ -135398,8 +135249,9 @@ aaa aaa aaa aaa -abj aaa +wXe +rkU acC ant anP @@ -135680,7 +135532,7 @@ plj tNm ipz dDJ -jJh +dBq dBq dBq fTl @@ -138250,7 +138102,7 @@ gOP yed fZX aGy -cnC +tCb rza efP dDJ @@ -138512,7 +138364,7 @@ aIY aOE xvo tJO -tJO +aOE xvo xvo rqv @@ -138580,7 +138432,7 @@ cND cKT cNG cPr -dLB +ozX cPn cZx cVd @@ -138837,7 +138689,7 @@ cKA cKT cSu pGk -dLB +mwn cSp cTQ cVr @@ -138910,7 +138762,7 @@ aaa aaa aaa aaa -dWf +aaa aaa aaa aaa @@ -139351,7 +139203,7 @@ cKC cKT ncs xBJ -dLB +hwg cSt cTT cVt @@ -139862,7 +139714,7 @@ lmt bIG cJa cKF -cKT +cSr cNJ cPt ckI @@ -139953,7 +139805,7 @@ aaa aaa aaa aaa -aaa +dWf aaa aaa aaa @@ -143091,7 +142943,7 @@ aaa aaa aaa aaa -abj +aaa abj abj aaa @@ -143350,7 +143202,7 @@ aaa aaa aaa aaa -abj +aaa abj acC aip @@ -146946,13 +146798,13 @@ aaa aaa aaa aaa -tQK -tQK +dij +dij abj -tQK -tQK +dij +dij abj -tQK +dij aaa aaa aaa @@ -147199,20 +147051,20 @@ aaa aaa aaa aaa -tQK -tQK +dij +dij abj -tQK -tQK +dij +dij dKz aaa abj aaa aaa -tQK -tQK +dij +dij aGW -tQK +dij abj adg abj @@ -147456,7 +147308,7 @@ aaa aaa aaa aaa -tQK +dij aaa aaa abj @@ -147970,7 +147822,7 @@ aaa aaa aaa aaa -tQK +dij aaa ace acg @@ -148227,7 +148079,7 @@ aaa aaa aaa aaa -tQK +dij abj ace acg @@ -148738,10 +148590,10 @@ aaa aaa aaa aaa -tQK +dij aGW -tQK -tQK +dij +dij abj ace acg @@ -148995,7 +148847,7 @@ aaa aaa aaa aaa -tQK +dij aaa abj aaa @@ -149308,7 +149160,7 @@ aaa eNt xha bWr -tCb +hHW uOa bWr gbO @@ -149509,7 +149361,7 @@ aaa aaa aaa aaa -tQK +dij aaa abj aaa @@ -149565,7 +149417,7 @@ aaa eNt xKE bwA -web +rdb bWr shB frN @@ -149766,10 +149618,10 @@ aaa aaa aaa aaa -tQK -tQK -tQK -tQK +dij +dij +dij +dij abj ace aco @@ -149783,7 +149635,7 @@ ace aco acG abj -tQK +dij aaa aaa aaa @@ -150026,7 +149878,7 @@ aaa aaa aaa aaa -tQK +dij aaa ace aco @@ -150040,7 +149892,7 @@ ace aco acG aaa -tQK +dij aaa aaa aaa @@ -150297,7 +150149,7 @@ ace aco acG abj -tQK +dij aaa aaa aaa @@ -150540,7 +150392,7 @@ aaa aaa aaa aaa -tQK +dij aaa ace aco @@ -150554,7 +150406,7 @@ ace aco acG aaa -tQK +dij aaa aaa aaa @@ -150797,7 +150649,7 @@ aaa aaa aaa aaa -tQK +dij aaa ace acE @@ -151054,7 +150906,7 @@ aaa aaa aaa aaa -tQK +dij aaa aaa abj @@ -151068,7 +150920,7 @@ aaa abj aaa dKz -tQK +dij aaa aaa aaa @@ -151311,21 +151163,21 @@ aaa aaa aaa aaa -tQK -tQK +dij +dij abj -tQK -tQK +dij +dij aaa aaa abj aaa aaa -tQK -tQK +dij +dij abj -tQK -tQK +dij +dij aaa aaa aaa @@ -151572,13 +151424,13 @@ aaa aaa aaa aaa -tQK -tQK +dij +dij abj -tQK -tQK +dij +dij abj -tQK +dij aaa aaa aaa @@ -153414,7 +153266,7 @@ abj aaa abj abj -uEC +oEG aaa aaa aaa @@ -153671,7 +153523,7 @@ aaa aaa aaa aaa -uEC +oEG abj abj aaa @@ -155346,11 +155198,11 @@ bgs bgs abj aaa -tQK -tQK +dij +dij abj -tQK -tQK +dij +dij aaa aaa aaa @@ -155864,7 +155716,7 @@ abj aaa abj aaa -tQK +dij aaa aaa aaa @@ -156121,7 +155973,7 @@ abj abj aSC abj -tQK +dij abj aaa aaa @@ -156636,7 +156488,7 @@ dak jzK dbc abj -tQK +dij aaa aaa aaa @@ -157151,8 +157003,8 @@ jzK dbc abj abj -tQK -tQK +dij +dij abj dij dij @@ -157416,7 +157268,7 @@ abj aaa abj aaa -tQK +dij abj abj aaa @@ -157675,7 +157527,7 @@ abj aaa aaa aaa -tQK +dij aaa aaa aaa @@ -157932,7 +157784,7 @@ cTN aaa aaa aaa -tQK +dij aaa aaa aaa @@ -158189,7 +158041,7 @@ cTN cTN abj abj -tQK +dij aaa aaa aaa @@ -158448,7 +158300,7 @@ cTN aaa abj abj -tQK +dij aaa aaa aaa @@ -158962,7 +158814,7 @@ cTN aaa abj aaa -tQK +dij aaa aaa aaa @@ -159219,7 +159071,7 @@ cTN ewF rnO abj -tQK +dij aaa aaa aaa @@ -159331,12 +159183,12 @@ aaa aaa aaa aaa -uEC +oEG abj abj abj -uEC -uEC +oEG +oEG abj rfd qBc @@ -159476,7 +159328,7 @@ cTN aaa abj aaa -tQK +dij aaa aaa aaa @@ -159588,7 +159440,7 @@ aaa aaa aaa aaa -uEC +oEG aaa aaa aaa @@ -159845,7 +159697,7 @@ aaa aaa aaa aaa -uEC +oEG aaa aaa aaa @@ -159988,8 +159840,8 @@ abj cTN cTN aaa -tQK -tQK +dij +dij abj aaa aaa @@ -160228,7 +160080,7 @@ aaa aaa aaa aaa -tQK +dij abj abj cTN @@ -160359,7 +160211,7 @@ aaa aaa aaa aaa -uEC +oEG aaa aaa aaa @@ -160502,7 +160354,7 @@ cTN aaa aaa aaa -tQK +dij aaa aaa aaa @@ -160742,7 +160594,7 @@ aaa aaa aaa aaa -tQK +dij abj dak daT @@ -160759,7 +160611,7 @@ abj aaa aaa aaa -tQK +dij aaa aaa aaa @@ -160873,7 +160725,7 @@ aaa aaa aaa aaa -uEC +oEG aaa aaa aaa @@ -161013,8 +160865,8 @@ aaa abj aaa abj -rkU -tQK +aaa +dij abj abj aaa @@ -161130,7 +160982,7 @@ aaa aaa aaa aaa -uEC +oEG aaa aaa aaa @@ -161256,20 +161108,20 @@ aaa aaa aaa aaa -tQK +dij abj dak daT dbc abj -tQK -tQK -tQK -tQK -tQK -tQK +dij +dij +dij +dij +dij +dij abj -tQK +dij abj abj aaa @@ -161387,7 +161239,7 @@ aaa aaa aaa aaa -uEC +oEG aaa aaa aaa @@ -161513,13 +161365,13 @@ aaa aaa aaa aaa -tQK +dij aaa dak daT dbc aaa -tQK +dij aaa aaa aaa @@ -161770,7 +161622,7 @@ aaa aaa aaa aaa -tQK +dij abj dak daT @@ -161903,8 +161755,8 @@ aaa aaa abj abj -uEC -uEC +oEG +oEG abj abj vrw @@ -162033,7 +161885,7 @@ aaa jtN aaa aaa -tQK +dij aaa aaa aaa @@ -162284,7 +162136,7 @@ aaa aaa aaa aaa -tQK +dij abj abj cQb @@ -162541,13 +162393,13 @@ aaa aaa aaa aaa -tQK +dij abj aaa abj aaa abj -tQK +dij aaa aaa aaa @@ -162800,9 +162652,9 @@ aaa aaa aaa abj -tQK -tQK -tQK +dij +dij +dij abj aaa aaa diff --git a/modular_ss220/sm_space_drop/code/sm_button.dm b/modular_ss220/sm_space_drop/code/sm_button.dm index 48acd2fc384c..382fe10efecc 100644 --- a/modular_ss220/sm_space_drop/code/sm_button.dm +++ b/modular_ss220/sm_space_drop/code/sm_button.dm @@ -1,49 +1,21 @@ ////////////////////////////////////// -// SMDS Button // +// СБССМ Кнопки // ////////////////////////////////////// -/obj/machinery/sm_drop_controll_buttons - name = "SM Drop Controll" +/obj/machinery/driver_button/sm_drop_button + name = "Кнопка сброса СМ" desc = "Кнопка для экстренного выбраса СМ в космос" - icon = 'modular_ss220/sm_space_drop/icon/sm_buttons.dmi' - icon_state = "sm_button_off" + icon = 'modular_ss220/sm_space_drop/icons/sm_buttons.dmi' + icon_state = "launcherbtt" anchored = TRUE armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, rad = 100, fire = 90, acid = 70) idle_power_consumption = 2 active_power_consumption = 4 resistance_flags = LAVA_PROOF | FIRE_PROOF - /// ID tag of the driver to hook to - var/id_tag = "SpaceDropSM" - /// Are we active? - var/active = FALSE - /// Range of drivers + blast doors to hit - // Без этой залупы ошибки в оснвовном коде т.к. есть еше кнопки что использую эту залупу для ограничения действия что работает не коректно - var/range = 7 + id_tag = "SpaceDropSM" -/obj/machinery/button/indestructible - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - -/obj/machinery/sm_drop_controll_buttons/Initialize(mapload, place_dir) - . = ..() - switch(place_dir) - if(NORTH) - pixel_y = 25 - if(SOUTH) - pixel_y = -25 - if(EAST) - pixel_x = 25 - if(WEST) - pixel_x = -25 - -/obj/machinery/sm_drop_controll_buttons/attack_ai(mob/user) - attack_hand(user) - -/obj/machinery/sm_drop_controll_buttons/attack_ghost(mob/user) - if(user.can_advanced_admin_interact()) - attack_hand(user) - -/obj/machinery/sm_drop_controll_buttons/attack_hand(mob/user) +/obj/machinery/driver_button/sm_drop_button/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return @@ -52,46 +24,17 @@ add_fingerprint(user) - use_power(5) - // ADD GREG - for(var/obj/machinery/atmospherics/supermatter_crystal/engine/M) - if(M.id_tag == id_tag) - M.anchored = FALSE - // ADD GREG - - // Start us off - launch_sequence() - - -/obj/machinery/sm_drop_controll_buttons/proc/launch_sequence() - active = TRUE - icon_state = "sm_button_on_animated" - // Time sequence - // OPEN DOORS - // Wait 2 seconds - // LAUNCH - // Wait 5 seconds - // CLOSE - // Then make not active - - for(var/obj/machinery/door/poddoor/M) - if(M.id_tag == id_tag && !M.protected) - INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door, open)) - // 2 seconds after previous invocation - - for(var/obj/machinery/sm_mass_driver/M) - if(M.id_tag == id_tag) - addtimer(CALLBACK(M, TYPE_PROC_REF(/obj/machinery/sm_mass_driver, drive)), 2 SECONDS) + if(!allowed(usr)) + return - // We want this 5 seconds after open, so the delay is 7 seconds from this proc + use_power(5) - for(var/obj/machinery/door/poddoor/M) - if(M.id_tag == id_tag && !M.protected) - addtimer(CALLBACK(M, TYPE_PROC_REF(/obj/machinery/door, close)), 7 SECONDS) + for(var/obj/machinery/atmospherics/supermatter_crystal/engine/crystal in SSair.atmos_machinery) + if(crystal.id_tag == id_tag) + crystal.anchored = FALSE + break - // And rearm us - addtimer(CALLBACK(src, PROC_REF(rearm)), 7 SECONDS) + launch_sequence() -/obj/machinery/sm_drop_controll_buttons/proc/rearm() - icon_state = "sm_button_off" - active = FALSE +/obj/machinery/driver_button/drop_sm/multitool_act(mob/user, obj/item/I) + return FALSE diff --git a/modular_ss220/sm_space_drop/code/sm_mass_driver.dm b/modular_ss220/sm_space_drop/code/sm_mass_driver.dm index b3940ff763c1..4d7da96dec96 100644 --- a/modular_ss220/sm_space_drop/code/sm_mass_driver.dm +++ b/modular_ss220/sm_space_drop/code/sm_mass_driver.dm @@ -1,4 +1,4 @@ -/obj/machinery/sm_mass_driver +/obj/machinery/mass_driver/sm_mass_driver name = "Пусковая установка СМ" desc = "Запускает СМ бороздить просторы космоса." icon = 'icons/obj/objects.dmi' @@ -10,33 +10,7 @@ resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF // ADD GREG - /// Throw power - var/power = 1 - /// ID tag, used for buttons - var/id_tag = "SpaceDropSM" - /// This is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. - var/drive_range = 50 - -/obj/machinery/sm_mass_driver/proc/drive(amount) - if(stat & (BROKEN|NOPOWER)) - return - - use_power(500 * power) - var/O_limit = 0 - var/atom/target = get_edge_target_turf(src, dir) - for(var/atom/movable/O in loc) - if((!O.anchored && O.move_resist != INFINITY) || ismecha(O)) //Mechs need their launch platforms. Also checks if something is anchored or has move resist INFINITY, which should stop ghost flinging. - O_limit++ - - if(O_limit >= 20)//so no more than 20 items are sent at a time, probably for counter-lag purposes - break - - use_power(500) - var/coef = 1 - if(emagged) - coef = 5 - INVOKE_ASYNC(O, TYPE_PROC_REF(/atom/movable, throw_at), target, (drive_range * power * coef), (power * coef)) - - flick("mass_driver1", src) + id_tag = "SpaceDropSM" /obj/machinery/sm_mass_driver/multitool_act(mob/user, obj/item/I) + return FALSE diff --git a/modular_ss220/sm_space_drop/icon/sm_buttons.dmi b/modular_ss220/sm_space_drop/icon/sm_buttons.dmi deleted file mode 100644 index 5b1dac21c2b034362b9892a88d4249841076ac71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmV;U0bKrxP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a?DJ)I5Sc+(=$pSoZ^zil2jm5sW>-2skEddKQBH%Elr7wGbOXA7$|PY#hF%= zn41b=V^f_+lH&Npyv$sncnWr1K-ZOIg9y&jsuy0F|;pfZ`1z{Qv*} zkx4{BRA_&J6EAnQxqTYq`P1EwYJ*JpCT?G+E0-*LZxia$}( z>wofbRoMXm0002~jr~FW{$QMv1Csautv!AJ-`dkFW-Ao?0{{T1^92;^HV>lT8*2an N002ovPDHLkV1lC3uTTI0 diff --git a/modular_ss220/sm_space_drop/icons/sm_buttons.dmi b/modular_ss220/sm_space_drop/icons/sm_buttons.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8cf7cbd7e3d58d6e2acac5f0719f4818c33ce250 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^2Y|SNg&9b$UsW9eq|^g^LR=3VIFOK#uz&x4TU*#tqcMSQ6wH%;50sMjDXQR233Y;*wgN zT$EW*l9`{!z)&$KIIN(k^!u0Kf{$OHXnE^uojY?rctfbcMdJsLbk6%|o@6LGhXhW91T;&TeDX%_}4{vQ8YG88&6cY_7!Q6}~>l z7K&wfdS&?~sd_}P^X!}=8uK^ifF3hLK$q@eKF?K$fv%b5>EalY(fIb}Y2HHy0xTDD z8Lbp_AMknbmNfi$;>S6~0f=gsFs(mwiv2?M^+21Tn$Ir4KruI4J+U%pd8WBhzuEcr ziIrO(udF{{dvfyo#j$dKnb(~Ul6(8@mHdW1-j)BlFa4P#(zEZ$->eiqpoI({vQPbX zShj~h<&^*NOvkSut#wztW6pFemG|IYCF~Vt@N3drU}*nY&wr*$=i735sjnbSp00i_ I>zopr07*8f4gdfE literal 0 HcmV?d00001 diff --git a/modular_ss220/sm_space_drop/sm_space_drop.dm b/modular_ss220/sm_space_drop/sm_space_drop.dm index 1789fd0f7161..c55009661aee 100644 --- a/modular_ss220/sm_space_drop/sm_space_drop.dm +++ b/modular_ss220/sm_space_drop/sm_space_drop.dm @@ -1,16 +1,7 @@ /datum/modpack/sm_space_drop - /// A string name for the modpack. Used for looking up other modpacks in init. - name = "sm_space_drop" - /// A string desc for the modpack. Can be used for modpack verb list as description. - desc = "its useless" - /// A string with authors of this modpack. - author = "furior" -/datum/modpack/sm_space_drop/pre_initialize() - . = ..() + name = "Система сброса СМ" -/datum/modpack/sm_space_drop/initialize() - . = ..() + desc = "Позволяет сбросить СМ в критической ситуации когда остановить разложение или востановить его уже нельзя" -/datum/modpack/sm_space_drop/post_initialize() - . = ..() + author = "GREG" From a91d49b1a7afe42c23d8c737ccb07683ab65fb21 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 03:17:43 +0500 Subject: [PATCH 03/14] Access_fix_and_name --- modular_ss220/sm_space_drop/code/paper_sm_info.dm | 7 +++++-- modular_ss220/sm_space_drop/code/sm_button.dm | 3 ++- modular_ss220/sm_space_drop/code/sm_mass_driver.dm | 4 +--- modular_ss220/sm_space_drop/sm_space_drop.dme | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modular_ss220/sm_space_drop/code/paper_sm_info.dm b/modular_ss220/sm_space_drop/code/paper_sm_info.dm index d610bcd7fbea..224ea2208777 100644 --- a/modular_ss220/sm_space_drop/code/paper_sm_info.dm +++ b/modular_ss220/sm_space_drop/code/paper_sm_info.dm @@ -1,7 +1,7 @@ // Инструкция пользование системы сброса СМ /obj/item/paper/sm_paper - name = "Инструкция по использованию СБСКС" + name = "\improper инструкция по использованию СБСКС" icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper" info = {"
Инструкция по использованию Системы Быстрого Сброса Кристала Суперматерии
@@ -16,4 +16,7 @@
5. Создание помехи при неообходимости сброса кристала квалифицируется статьей 400 космического закона.
-
Поздравляю! Теперь в случае вероятности взрыва кристала супер материи вы в состоянии сохранить целостность станции.
"} +
Поздравляю! Теперь в случае вероятности взрыва кристала супер материи вы в состоянии сохранить целостность станции.
+ +
ПРИМЕЧАНИЕ Кнопка сброса СМ находится в его буферной зоне на стене возле правого вента.
+"} diff --git a/modular_ss220/sm_space_drop/code/sm_button.dm b/modular_ss220/sm_space_drop/code/sm_button.dm index 382fe10efecc..87166c1efee1 100644 --- a/modular_ss220/sm_space_drop/code/sm_button.dm +++ b/modular_ss220/sm_space_drop/code/sm_button.dm @@ -4,7 +4,7 @@ ////////////////////////////////////// /obj/machinery/driver_button/sm_drop_button - name = "Кнопка сброса СМ" + name = "\improper кнопка сброса СМ" desc = "Кнопка для экстренного выбраса СМ в космос" icon = 'modular_ss220/sm_space_drop/icons/sm_buttons.dmi' icon_state = "launcherbtt" @@ -14,6 +14,7 @@ active_power_consumption = 4 resistance_flags = LAVA_PROOF | FIRE_PROOF id_tag = "SpaceDropSM" + req_access = list(ACCESS_CE) /obj/machinery/driver_button/sm_drop_button/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) diff --git a/modular_ss220/sm_space_drop/code/sm_mass_driver.dm b/modular_ss220/sm_space_drop/code/sm_mass_driver.dm index 4d7da96dec96..5969bee02750 100644 --- a/modular_ss220/sm_space_drop/code/sm_mass_driver.dm +++ b/modular_ss220/sm_space_drop/code/sm_mass_driver.dm @@ -1,14 +1,12 @@ /obj/machinery/mass_driver/sm_mass_driver - name = "Пусковая установка СМ" + name = "\improper пусковая установка СМ" desc = "Запускает СМ бороздить просторы космоса." icon = 'icons/obj/objects.dmi' icon_state = "mass_driver" anchored = TRUE idle_power_consumption = 2 active_power_consumption = 50 - // ADD GREG resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - // ADD GREG id_tag = "SpaceDropSM" diff --git a/modular_ss220/sm_space_drop/sm_space_drop.dme b/modular_ss220/sm_space_drop/sm_space_drop.dme index a14759d1b3ed..bd1b3e1ac98f 100644 --- a/modular_ss220/sm_space_drop/sm_space_drop.dme +++ b/modular_ss220/sm_space_drop/sm_space_drop.dme @@ -1,6 +1,6 @@ #include "sm_space_drop.dm" -#include "code\sm_button.dm" -#include "code\sm_space_drop.dm" -#include "code\sm_mass_driver.dm" -#include "code\paper_sm_info.dm" +#include "code/sm_button.dm" +#include "code/sm_space_drop.dm" +#include "code/sm_mass_driver.dm" +#include "code/paper_sm_info.dm" From 7f72c39246cf0bd9774ab54b6b5574f0a3c5dd62 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 03:56:47 +0500 Subject: [PATCH 04/14] Description_Correction --- modular_ss220/sm_space_drop/sm_space_drop.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/sm_space_drop/sm_space_drop.dm b/modular_ss220/sm_space_drop/sm_space_drop.dm index c55009661aee..0453f21fcca4 100644 --- a/modular_ss220/sm_space_drop/sm_space_drop.dm +++ b/modular_ss220/sm_space_drop/sm_space_drop.dm @@ -2,6 +2,6 @@ name = "Система сброса СМ" - desc = "Позволяет сбросить СМ в критической ситуации когда остановить разложение или востановить его уже нельзя" + desc = "Позволяет сбросить СМ в критической ситуации." author = "GREG" From d423cacaec7837fdb73455a6f8b8d2adec91b8d2 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 04:03:46 +0500 Subject: [PATCH 05/14] Map_Fix --- _maps/map_files220/delta/delta.dmm | 4377 +++++++++++++--------------- 1 file changed, 2036 insertions(+), 2341 deletions(-) diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index d18f3a9058af..07408438155c 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -543,9 +543,7 @@ "aeP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "aeQ" = ( @@ -765,9 +763,7 @@ /obj/structure/sign/vacuum{ pixel_y = 32 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -1123,14 +1119,6 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry) -"aiE" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/economy/atm/east, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "aiF" = ( /obj/structure/chair{ dir = 8 @@ -1334,9 +1322,7 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "ali" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -1518,9 +1504,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "amA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -2507,9 +2491,7 @@ dir = 4; id = "garbage" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -3207,9 +3189,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "asR" = ( @@ -3221,9 +3201,7 @@ /obj/machinery/door/poddoor/preopen{ id_tag = "innerdisposal" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -3996,9 +3974,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "avx" = ( @@ -4015,14 +3991,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"avE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "avI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4165,9 +4133,7 @@ /area/station/maintenance/disposal) "awC" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/disposal) @@ -4415,9 +4381,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "axz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4536,23 +4500,12 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/corner{ +/obj/effect/turf_decal/stripes/line{ dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axK" = ( -/obj/structure/table/reinforced, -/obj/item/paper/sm_paper, -/obj/machinery/driver_button/sm_drop_button{ - pixel_y = -16; - pixel_x = 8; - range = 20 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/office/ce) -"axL" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -4566,19 +4519,19 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axN" = ( -/obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/structure/dispenser, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axO" = ( @@ -4598,6 +4551,16 @@ icon_state = "neutralfull" }, /area/station/engineering/controlroom) +"axR" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "axS" = ( /obj/structure/sign/nosmoking_2{ pixel_y = -32 @@ -4620,6 +4583,18 @@ icon_state = "yellowfull" }, /area/station/engineering/controlroom) +"axW" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "axY" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -4767,9 +4742,7 @@ id = "garbage" }, /obj/machinery/recycler, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -4782,6 +4755,15 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"ayJ" = ( +/obj/machinery/atmospherics/binary/valve/digital, +/obj/machinery/driver_button/sm_drop_button{ + pixel_y = -16; + pixel_x = 8; + range = 20 + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "ayK" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/turf_decal/stripes/line{ @@ -4797,10 +4779,12 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "ayO" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/machinery/atmospherics/meter, +/obj/structure/table/reinforced, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ayP" = ( @@ -4815,13 +4799,6 @@ icon_state = "neutralfull" }, /area/station/engineering/controlroom) -"ayT" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "Gas to Loop" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ayV" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -5507,9 +5484,7 @@ /area/station/supply/storage) "aBQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -5541,11 +5516,19 @@ /turf/space, /area/space/nearstation) "aBX" = ( +/obj/machinery/camera{ + c_tag = "Supermatter West"; + dir = 4; + network = list("Engineering","SS13"); + pixel_y = -22 + }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/atmospherics/portable/canister/toxins, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aBY" = ( @@ -5568,9 +5551,10 @@ /turf/simulated/floor/plating, /area/station/engineering/controlroom) "aCi" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aCj" = ( @@ -5742,15 +5726,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"aCV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aCW" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5807,6 +5782,13 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"aDh" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/reflector/box{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aDj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance/two, @@ -5929,6 +5911,17 @@ }, /turf/space, /area/station/maintenance/auxsolarport) +"aEd" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aEe" = ( /obj/machinery/light/directional/west, /obj/structure/cable/yellow{ @@ -6730,16 +6723,6 @@ }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) -"aHG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) "aHI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -7005,10 +6988,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) -"aIy" = ( -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "aIz" = ( /obj/machinery/power/terminal{ dir = 4 @@ -7020,30 +6999,52 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIA" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/space/nearstation) -"aID" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular{ + pixel_y = 6 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"aIE" = ( -/obj/machinery/light/directional/south, -/obj/machinery/status_display/directional/south, +"aIB" = ( /obj/effect/turf_decal/stripes/line{ dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"aIF" = ( +"aID" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"aIE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) +"aIF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/portable/canister/nitrogen, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aIG" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -7094,6 +7095,9 @@ dir = 6 }, /obj/item/kirbyplants, +/obj/structure/railing/cap/normal{ + dir = 4 + }, /turf/simulated/floor/wood/fancy, /area/station/service/theatre) "aIY" = ( @@ -7235,13 +7239,9 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "aJF" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/meter, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/space/nearstation) "aJG" = ( /obj/structure/table/reinforced, /obj/machinery/light/small/directional/south, @@ -7337,21 +7337,12 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aJU" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/controlroom) "aJV" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -7569,9 +7560,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "aKK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aKL" = ( @@ -7691,15 +7680,19 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aLw" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/unary/thermomachine/freezer{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -7884,20 +7877,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) -"aMJ" = ( -/obj/machinery/atmospherics/trinary/tvalve/digital{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aMK" = ( /turf/space, /area/station/hallway/secondary/entry) @@ -8258,6 +8237,9 @@ /obj/structure/railing/corner{ dir = 8 }, +/obj/structure/railing/cap/normal{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8460,15 +8442,6 @@ icon_state = "neutralfull" }, /area/station/maintenance/turbine) -"aPy" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "aPz" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/storage/hazardvest, @@ -9063,6 +9036,19 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"aSH" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aSI" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -9368,9 +9354,7 @@ dir = 4 }, /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) "aUt" = ( @@ -9839,9 +9823,7 @@ }, /area/station/hallway/primary/fore) "aWu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /mob/living/simple_animal/hostile/gorilla/cargo_domestic{ name = "Forklift" }, @@ -9849,9 +9831,7 @@ /area/station/supply/storage) "aWz" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aWA" = ( @@ -9902,9 +9882,7 @@ c_tag = "Cargo Dock South"; dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aWH" = ( @@ -11729,15 +11707,11 @@ /area/station/security/warden) "beq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "ber" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "bes" = ( @@ -13233,9 +13207,7 @@ }, /area/station/engineering/atmos) "bkK" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "bkL" = ( @@ -13246,12 +13218,6 @@ icon_state = "neutralfull" }, /area/station/engineering/atmos) -"bkM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos) "bkN" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -13884,12 +13850,9 @@ }, /area/station/hallway/secondary/bridge) "bnK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 - }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "bnM" = ( @@ -15694,9 +15657,7 @@ pixel_y = 3 }, /obj/item/circuitboard/card, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -16322,9 +16283,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -16633,9 +16592,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bAe" = ( @@ -17515,9 +17472,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bDp" = ( @@ -17948,9 +17903,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bEO" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bEQ" = ( @@ -18384,9 +18337,7 @@ /area/station/engineering/gravitygenerator) "bGv" = ( /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bGw" = ( @@ -21490,9 +21441,7 @@ /obj/machinery/light/directional/north, /obj/machinery/ai_status_display/north, /obj/machinery/teleport/station, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bQE" = ( @@ -21744,9 +21693,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bRz" = ( @@ -22027,9 +21974,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bSy" = ( @@ -22185,9 +22130,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bTd" = ( @@ -22746,9 +22689,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bUJ" = ( @@ -23427,9 +23368,7 @@ dir = 8; network = list("SS13","Minisat") }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bXo" = ( @@ -23844,10 +23783,10 @@ "bYU" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/cleanable/dirt, /obj/structure/railing{ - dir = 1 + dir = 9 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -23882,9 +23821,7 @@ /area/station/telecomms/chamber) "bZj" = ( /obj/structure/grille, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZk" = ( @@ -23894,9 +23831,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZl" = ( @@ -23906,9 +23841,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZm" = ( @@ -23930,9 +23863,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZo" = ( @@ -23947,9 +23878,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZp" = ( @@ -24448,9 +24377,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cbd" = ( @@ -24700,9 +24627,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cbS" = ( @@ -25030,9 +24955,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -25049,9 +24972,7 @@ }, /area/station/maintenance/port) "cdh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cdk" = ( @@ -25060,9 +24981,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cdl" = ( @@ -25071,9 +24990,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cdn" = ( @@ -25120,9 +25037,7 @@ icon_state = "1-8" }, /obj/effect/landmark/start/engineer, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/smes) "cdq" = ( @@ -25822,9 +25737,7 @@ dir = 8; network = list("SS13","Singularity","Engineering") }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cgC" = ( @@ -26259,9 +26172,7 @@ /area/station/maintenance/port) "cio" = ( /obj/effect/landmark/spawner/xeno, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "cip" = ( @@ -27372,19 +27283,15 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "cnB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "cnC" = ( -/obj/structure/railing/corner{ +/obj/structure/railing/cap/reversed{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -28167,9 +28074,7 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "cqV" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cqX" = ( @@ -28475,9 +28380,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/engineering/control) "csr" = ( @@ -28516,9 +28419,7 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/engineering/control) "csv" = ( @@ -29600,9 +29501,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "cxG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cxJ" = ( @@ -29699,9 +29598,7 @@ /turf/simulated/floor/wood/parquet/tile, /area/station/service/library) "cyc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) @@ -31008,9 +30905,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -31088,9 +30983,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cDu" = ( @@ -31173,9 +31066,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/engineering/control) "cDH" = ( @@ -31187,9 +31078,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cDI" = ( @@ -31281,9 +31170,7 @@ name = "Expedition Access" }, /obj/effect/mapping_helpers/airlock/access/all/command/expedition, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31411,9 +31298,7 @@ id_tag = "eva-shutters"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cER" = ( @@ -31427,9 +31312,7 @@ id_tag = "eva-shutters"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cES" = ( @@ -31858,9 +31741,7 @@ name = "Electrical Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32198,9 +32079,7 @@ /area/station/science/research) "cJa" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/research) "cJb" = ( @@ -32581,7 +32460,6 @@ }, /area/station/science/research) "cKD" = ( -/obj/structure/railing/corner, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -32680,7 +32558,6 @@ }, /area/station/medical/chemistry) "cKT" = ( -/obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -33262,9 +33139,6 @@ }, /area/station/science/research) "cNF" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/table/glass, /obj/item/stock_parts/cell/high, /obj/structure/disposalpipe/segment, @@ -33275,16 +33149,19 @@ "cNG" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/brflowers, +/obj/structure/railing{ + dir = 9 + }, /turf/simulated/floor/grass, /area/station/science/research) "cNH" = ( /obj/effect/landmark/lightsout, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/grass, /area/station/science/research) "cNJ" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/structure/table/glass, /obj/item/paicard, /turf/simulated/floor/plasteel{ @@ -33651,9 +33528,6 @@ }, /area/station/science/research) "cPq" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/table/glass, /obj/item/gps, /obj/item/flash{ @@ -33667,12 +33541,12 @@ /area/station/science/research) "cPr" = ( /obj/structure/flora/bush, +/obj/structure/railing{ + dir = 10 + }, /turf/simulated/floor/grass, /area/station/science/research) "cPt" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ dir = 1; @@ -34147,15 +34021,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cRI" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cRJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cRK" = ( @@ -34441,15 +34311,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) -"cSr" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/research) "cSs" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -34461,6 +34322,10 @@ }, /area/station/science/research) "cSu" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/cap/reversed, /turf/simulated/floor/grass, /area/station/science/research) "cSv" = ( @@ -34707,9 +34572,7 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/research) "cTD" = ( @@ -34960,9 +34823,7 @@ name = "Electrical Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cUT" = ( @@ -35139,9 +35000,7 @@ /obj/machinery/light/directional/east, /obj/item/folder/white, /obj/item/pen, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -35864,9 +35723,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cYj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/science/research) @@ -35903,9 +35760,7 @@ /turf/simulated/floor/plasteel, /area/station/science/rnd) "cYq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/rnd) "cYr" = ( @@ -36098,9 +35953,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "cZI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/camera{ c_tag = "Medbay Virology Decontamination"; network = list("Medical","SS13") @@ -37272,9 +37125,7 @@ }, /area/station/maintenance/port2) "dfW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/port2) "dfX" = ( @@ -37946,9 +37797,7 @@ }, /area/station/security/prison/cell_block/A) "djp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/command/office/rd) "djq" = ( @@ -39086,9 +38935,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "dpS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/port2) @@ -39194,9 +39041,7 @@ /turf/simulated/wall/r_wall, /area/station/science/robotics) "dqo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "dqp" = ( @@ -39398,9 +39243,7 @@ /area/station/maintenance/port2) "drk" = ( /obj/structure/chair/office/light, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/port2) "drl" = ( @@ -39971,9 +39814,7 @@ }, /area/station/medical/medbay2) "dtI" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "dtJ" = ( @@ -40241,9 +40082,7 @@ name = "Robotics Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -40312,9 +40151,7 @@ /area/station/science/robotics) "dvo" = ( /obj/effect/landmark/start/roboticist, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel, /area/station/science/robotics) "dvp" = ( @@ -40381,9 +40218,7 @@ }, /area/station/security/brig) "dvU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/space/nearstation) "dwi" = ( @@ -40852,9 +40687,7 @@ /turf/simulated/floor/plasteel, /area/station/science/robotics) "dzX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -41677,9 +41510,7 @@ /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "dEw" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "dEx" = ( @@ -41866,14 +41697,6 @@ }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) -"dFi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "dFm" = ( /turf/simulated/wall/r_wall, /area/station/science/storage) @@ -42260,9 +42083,7 @@ "dIb" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dIi" = ( @@ -42321,9 +42142,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/effect/mapping_helpers/airlock/access/any/science/research, /turf/simulated/floor/plasteel, @@ -42383,9 +42202,7 @@ dir = 1; network = list("Research","SS13") }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "dIN" = ( @@ -43100,9 +42917,7 @@ /obj/machinery/computer/rdconsole/robotics{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/robotics) "dOd" = ( @@ -43222,9 +43037,7 @@ /obj/structure/window/reinforced/polarized{ id = "RoboSurgery" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/robotics) "dOO" = ( @@ -43602,9 +43415,7 @@ id_tag = "evashutters2"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQf" = ( @@ -43617,9 +43428,7 @@ id = "evashutters2"; name = "Auxilary E.V.A. Storage" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQg" = ( @@ -43635,9 +43444,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQh" = ( @@ -43678,9 +43485,7 @@ name = "Auxiliary E.V.A." }, /obj/effect/mapping_helpers/airlock/access/any/command/eva, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dQp" = ( @@ -43724,9 +43529,7 @@ anchored = 1; state = 2 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/space/nearstation) "dQD" = ( @@ -43902,9 +43705,7 @@ /area/station/maintenance/portsolar) "dRp" = ( /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/portsolar) "dRq" = ( @@ -43948,9 +43749,7 @@ /area/station/service/chapel) "dRB" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dRD" = ( @@ -43961,9 +43760,7 @@ "dRE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43972,9 +43769,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dRF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dRG" = ( @@ -44421,9 +44216,7 @@ /area/station/maintenance/apmaint) "dTh" = ( /obj/machinery/door/airlock/maintenance, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) @@ -44689,9 +44482,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dUm" = ( @@ -44808,9 +44599,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating/airless, /area/space/nearstation) "dUF" = ( @@ -46400,11 +46189,6 @@ /area/station/security/permabrig) "efP" = ( /obj/structure/railing, -/obj/structure/railing/corner{ - dir = 10; - pixel_x = -8; - pixel_y = 3 - }, /obj/structure/chair/comfy/brown{ dir = 1 }, @@ -46543,6 +46327,13 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) +"eiU" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/space, +/area/station/engineering/controlroom) "eiX" = ( /turf/simulated/floor/transparent/glass, /area/station/maintenance/virology_maint) @@ -47254,9 +47045,6 @@ }, /area/station/maintenance/fore) "ewj" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -47701,7 +47489,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/obj/item/radio/intercom/directional/south, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -47759,16 +47551,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/science/research) -"eFV" = ( -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellowcorner" - }, -/area/station/engineering/controlroom) "eFX" = ( /obj/structure/chair/sofa/right{ color = "#A30FAF"; @@ -48065,9 +47847,7 @@ /turf/simulated/floor/wood/oak, /area/station/legal/magistrate) "eLd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -48645,9 +48425,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "eUF" = ( @@ -49258,6 +49036,16 @@ }, /turf/simulated/floor/plating, /area/station/legal/courtroom) +"fjw" = ( +/obj/machinery/power/smes{ + charge = 1e+006 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/maintenance/turbine) "fjF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -50314,6 +50102,11 @@ /obj/effect/spawner/wire_splicing/thirty, /turf/simulated/floor/plating, /area/station/maintenance/port) +"fCZ" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "fDh" = ( /obj/structure/rack, /obj/item/crowbar/red, @@ -50595,9 +50388,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -52478,9 +52269,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gpP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/door_control/shutter/south{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; @@ -53157,9 +52946,8 @@ }, /area/station/medical/morgue) "gBo" = ( -/turf/simulated/floor/plasteel{ - icon_state = "yellowcorner" - }, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gBF" = ( /obj/structure/table/reinforced, @@ -53667,9 +53455,7 @@ /turf/simulated/floor/plasteel/freezer, /area/station/public/toilet) "gLk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -54286,9 +54072,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/aitransit) "gVw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/engine, /area/station/medical/chemistry) @@ -55639,15 +55423,6 @@ }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) -"hwg" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/research) "hwu" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -56063,9 +55838,7 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/science/research) @@ -56311,6 +56084,14 @@ icon_state = "neutralfull" }, /area/station/security/checkpoint/south) +"hGx" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "hGN" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/north, @@ -56381,9 +56162,7 @@ /area/station/science/research) "hHr" = ( /obj/machinery/light/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/supply/storage) "hHx" = ( @@ -56626,9 +56405,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, @@ -58539,13 +58316,12 @@ /turf/simulated/floor/plating, /area/station/service/theatre) "iqR" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/trinary/mixer/flipped{ - dir = 8; - name = "Миксер топливной смеси турбины" +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Gas to Loop" }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ird" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -59013,15 +58789,6 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/aft) -"iyC" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/power/emitter{ - anchored = 1; - dir = 1; - state = 2 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ize" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -59044,7 +58811,7 @@ /area/station/medical/surgery/primary) "izz" = ( /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -60432,13 +60199,15 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "iZL" = ( -/obj/effect/turf_decal/stripes/corner{ +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -60842,6 +60611,15 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/warden) +"jhz" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/power/emitter{ + anchored = 1; + dir = 1; + state = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "jhD" = ( /obj/machinery/computer/security{ dir = 1 @@ -60856,17 +60634,9 @@ }, /area/station/security/brig) "jhG" = ( -/obj/machinery/camera{ - c_tag = "Supermatter East"; - dir = 8; - network = list("Engineering","SS13") - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/reflector/box{ + dir = 4 }, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "jhH" = ( @@ -60881,6 +60651,15 @@ }, /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) +"jhJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "yellow" + }, +/area/station/engineering/controlroom) "jhM" = ( /obj/structure/table/glass, /obj/item/stack/packageWrap{ @@ -61434,9 +61213,7 @@ /area/station/science/genetics) "jpy" = ( /obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "jpB" = ( @@ -61534,18 +61311,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jqX" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/turf/simulated/floor/plasteel{ + icon_state = "yellowcorner" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "jqZ" = ( /obj/structure/table/wood, @@ -61761,6 +61529,7 @@ "jvm" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, +/obj/random/hampter, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -62519,6 +62288,12 @@ icon_state = "red" }, /area/station/engineering/atmos) +"jJh" = ( +/obj/structure/railing/cap/normal{ + dir = 4 + }, +/turf/simulated/floor/wood/oak, +/area/station/service/theatre) "jJj" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -63562,25 +63337,6 @@ }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) -"kaO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/atmos) "kaP" = ( /obj/machinery/light/directional/south, /obj/structure/table/wood, @@ -63740,9 +63496,7 @@ locked = 1; name = "Escape External Access" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/access_button/east{ autolink_id = "escape_btn_ext"; name = "exterior access button"; @@ -64079,9 +63833,7 @@ }, /area/station/supply/storage) "kiB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/delivery/hollow, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, @@ -64233,9 +63985,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -64437,21 +64187,13 @@ /turf/simulated/wall, /area/station/maintenance/old_kitchen) "kqp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/trinary/mixer/flipped{ + dir = 8; + name = "Миксер топливной смеси турбины" }, -/obj/machinery/atmospherics/portable/canister/nitrogen, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "kqF" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -64606,11 +64348,6 @@ /obj/effect/decal/cleanable/ants, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) -"kur" = ( -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) "kut" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/directional/north, @@ -64633,19 +64370,6 @@ }, /turf/simulated/floor/plasteel, /area/station/science/research) -"kuJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "yellow" - }, -/area/station/engineering/controlroom) "kuK" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/table/reinforced, @@ -65439,9 +65163,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/main) "kIs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -65480,10 +65202,6 @@ "kIP" = ( /turf/simulated/floor/wood/oak, /area/station/maintenance/library) -"kJd" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "kJV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66277,9 +65995,6 @@ /turf/simulated/floor/engine, /area/station/science/test_chamber) "kWO" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/disposalpipe/junction/reversed, /turf/simulated/floor/plasteel/white, /area/station/science/research) @@ -66316,6 +66031,17 @@ icon_state = "whiteyellowfull" }, /area/station/medical/chemistry) +"kXZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/analyzer, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "kYh" = ( /obj/structure/table/wood, /obj/item/camera_film, @@ -67313,13 +67039,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) -"lqL" = ( -/obj/machinery/mass_driver/sm_mass_driver{ - dir = 1 - }, -/obj/machinery/atmospherics/supermatter_crystal/engine, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) "lrb" = ( /obj/structure/cable{ d1 = 1; @@ -67471,6 +67190,19 @@ icon_state = "whitepurple" }, /area/station/science/toxins/mixing) +"ltw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "yellow" + }, +/area/station/engineering/controlroom) "ltA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, @@ -69168,15 +68900,13 @@ }, /area/station/medical/virology) "lWo" = ( -/obj/machinery/power/smes{ - charge = 1e+006 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 }, -/turf/simulated/floor/plasteel/dark, -/area/station/maintenance/turbine) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "lWq" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -69222,6 +68952,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"lYq" = ( +/obj/structure/table/wood/poker, +/obj/effect/decal/cleanable/dirt, +/obj/random/hampter, +/turf/simulated/floor/plasteel/grimy, +/area/station/maintenance/abandonedbar) "lYz" = ( /obj/effect/spawner/random_spawners/grille_maybe, /obj/structure/cable{ @@ -70351,7 +70087,6 @@ /area/station/hallway/secondary/exit) "muI" = ( /obj/machinery/hologram/holopad, -/obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -70388,15 +70123,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/sw) -"mwn" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/research) "mwo" = ( /obj/effect/landmark/start/doctor, /turf/simulated/floor/plasteel{ @@ -70498,18 +70224,23 @@ }, /area/station/security/brig) "mxG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/obj/structure/window/plasmareinforced{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/structure/cable/yellow{ +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 4; d2 = 8; - icon_state = "0-8" + icon_state = "4-8" }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "myf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71178,13 +70909,16 @@ /area/station/maintenance/fore) "mPO" = ( /obj/effect/turf_decal/stripes/line{ - dir = 9 + dir = 1 }, -/obj/structure/table/reinforced, -/obj/item/stack/cable_coil/random, -/obj/item/stack/cable_coil/random, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/maintenance/turbine) "mPR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71807,17 +71541,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/research) -"mZv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/controlroom) "mZR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -71996,6 +71719,10 @@ /area/station/medical/virology/lab) "ncs" = ( /obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/cap/normal, /turf/simulated/floor/grass, /area/station/science/research) "nct" = ( @@ -74022,6 +73749,13 @@ icon_state = "seadeep" }, /area/station/public/fitness) +"nIM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "nJn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -74593,13 +74327,18 @@ /turf/simulated/floor/plasteel/white, /area/station/security/permabrig) "nRx" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -74740,6 +74479,20 @@ icon_state = "purple" }, /area/station/service/janitor) +"nUm" = ( +/obj/machinery/camera{ + c_tag = "Supermatter East"; + dir = 8; + network = list("Engineering","SS13") + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "nUp" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal, @@ -74790,23 +74543,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) -"nUR" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/unary/thermomachine/freezer{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "nVf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -75097,15 +74833,13 @@ }, /area/station/public/fitness) "oan" = ( -/obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/obj/machinery/economy/vending/wallmed/directional/south, /obj/structure/cable/yellow{ - d1 = 4; + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -75255,22 +74989,6 @@ icon_state = "neutral" }, /area/station/security/permabrig) -"ocA" = ( -/obj/machinery/camera{ - c_tag = "Supermatter West"; - dir = 4; - network = list("Engineering","SS13"); - pixel_y = -22 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/portable/canister/toxins, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "ocJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -75368,19 +75086,15 @@ /area/station/science/robotics/showroom) "oeZ" = ( /obj/effect/turf_decal/stripes/line{ - dir = 2 + dir = 8 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/reflector/box{ + dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "off" = ( /turf/simulated/floor/plasteel{ @@ -75822,11 +75536,24 @@ /turf/simulated/wall/r_wall, /area/station/medical/storage/secondary) "onA" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/atmos) "onD" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -75934,9 +75661,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "ooN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -76041,18 +75766,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/dormitory_maintenance) -"oql" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/firealarm/directional/east, -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) "oqq" = ( /obj/effect/decal/cleanable/dust, /obj/machinery/light/small/directional/east, @@ -76366,9 +76079,7 @@ id_tag = "eva-shutters"; name = "E.V.A. Storage Shutters" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -76513,15 +76224,6 @@ icon_state = "neutral" }, /area/station/maintenance/port) -"ozX" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/research) "oAd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -76560,16 +76262,12 @@ }, /area/station/hallway/primary/port) "oAP" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/mass_driver/sm_mass_driver{ dir = 1 }, -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/analyzer, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/supermatter_crystal/engine, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "oAU" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -76698,9 +76396,6 @@ }, /area/station/science/genetics) "oCV" = ( -/obj/structure/reflector/box{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "oCX" = ( @@ -76959,9 +76654,7 @@ }, /area/station/medical/break_room) "oJn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -77041,8 +76734,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oKV" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "oLg" = ( @@ -78020,9 +77714,7 @@ dir = 1; network = list("Engineering","SS13") }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/item/radio/intercom/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/plasteel, @@ -78572,9 +78264,7 @@ }, /area/station/medical/virology/lab) "plN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "pmA" = ( @@ -79466,6 +79156,22 @@ icon_state = "darkredcorners" }, /area/station/security/brig) +"pAQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "pAT" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -79728,18 +79434,11 @@ /area/station/science/explab) "pGk" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/railing{ - dir = 6; - pixel_x = 6; - pixel_y = -4 - }, /obj/item/kirbyplants{ pixel_y = 7 }, -/obj/structure/railing/corner{ - dir = 9; - pixel_x = 2; - pixel_y = -28 +/obj/structure/railing{ + dir = 6 }, /turf/simulated/floor/grass, /area/station/science/research) @@ -79966,14 +79665,14 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "pJw" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellowcorner" }, -/obj/structure/dispenser, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "pJP" = ( /obj/machinery/light/small/directional/south, @@ -80333,6 +80032,9 @@ "pPG" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/bush, +/obj/structure/railing{ + dir = 6 + }, /turf/simulated/floor/grass, /area/station/science/research) "pPL" = ( @@ -80475,10 +80177,16 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "pSJ" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular{ - pixel_y = 6 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -80725,14 +80433,18 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pYc" = ( -/obj/machinery/atmospherics/binary/valve/digital, -/obj/machinery/driver_button/sm_drop_button{ - pixel_y = -16; - pixel_x = 8; - range = 20 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/portable/canister/nitrogen, +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "pYk" = ( /obj/machinery/flasher{ pixel_x = -24; @@ -80978,6 +80690,13 @@ }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) +"qdk" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "qdm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -80987,9 +80706,11 @@ }, /area/station/medical/sleeper) "qdE" = ( -/obj/structure/lattice, -/turf/space, -/area/station/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "qdW" = ( /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, @@ -82437,20 +82158,6 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) -"qEN" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "qEO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -82588,9 +82295,7 @@ /area/station/medical/virology/lab) "qGy" = ( /obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 @@ -83554,13 +83259,6 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) -"qWG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/item/radio/intercom/directional/west, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "qWV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -84132,18 +83830,17 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "rfT" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/portable/canister/nitrogen, -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/effect/spawner/window/reinforced/plasma/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/engine/supermatter) "rgg" = ( /obj/machinery/fishtank/wall, /turf/simulated/wall, @@ -85000,21 +84697,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "rwj" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plating, +/area/station/engineering/engine/supermatter) "rwn" = ( /obj/effect/spawner/lootdrop/trash, /turf/simulated/floor/plating, @@ -87986,9 +87675,7 @@ /area/station/hallway/primary/central) "sxp" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, /obj/item/gps/engineering, @@ -88034,6 +87721,20 @@ icon_state = "purple" }, /area/station/service/janitor) +"syc" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "syi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -89130,9 +88831,7 @@ /area/station/engineering/atmos) "sQj" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -89179,15 +88878,6 @@ }, /turf/simulated/floor/carpet, /area/station/service/library) -"sQZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "yellow" - }, -/area/station/engineering/controlroom) "sRE" = ( /obj/structure/cable{ d1 = 4; @@ -89754,13 +89444,11 @@ /area/station/maintenance/virology_maint) "tep" = ( /obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + dir = 1 }, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "teI" = ( @@ -90935,12 +90623,14 @@ }, /area/station/medical/surgery/secondary) "tzp" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +/obj/machinery/atmospherics/trinary/filter{ + dir = 1; + filter_type = "n2"; + name = "nitrogen filter"; + on = 1 }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "tzq" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -91045,10 +90735,14 @@ }, /area/station/engineering/atmos) "tCb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/cap/normal{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "bar" }, -/area/station/service/bar/atrium) +/area/station/maintenance/fsmaint) "tCF" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -91069,6 +90763,15 @@ icon_state = "Dark" }, /area/station/medical/virology) +"tCX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "tCY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -91105,12 +90808,18 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "tEe" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/structure/window/plasmareinforced{ dir = 4 }, -/turf/space, -/area/station/engineering/controlroom) +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "tEi" = ( /turf/simulated/floor/plasteel{ dir = 9; @@ -91236,9 +90945,7 @@ }, /area/station/engineering/atmos/control) "tFt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -91523,9 +91230,6 @@ /area/station/hallway/secondary/entry) "tJO" = ( /obj/structure/disposalpipe/segment, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91833,19 +91537,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "tQK" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/machinery/atmospherics/meter, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "tQS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -92007,16 +91705,15 @@ }, /area/station/maintenance/port) "tUw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/reflector/box{ - dir = 4 +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellow" +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "tUS" = ( /obj/structure/table/reinforced, @@ -92752,13 +92449,6 @@ icon_state = "white" }, /area/station/medical/sleeper) -"ufU" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/reflector/box{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "uge" = ( /obj/structure/cable{ d1 = 4; @@ -93263,6 +92953,14 @@ icon_state = "neutral" }, /area/station/maintenance/fore2) +"uoQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "uoR" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -93443,9 +93141,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/engineering/control) @@ -93586,9 +93282,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "uvQ" = ( @@ -93852,17 +93546,15 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) "uBp" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/spawner/window/reinforced/plasma/grilled, -/turf/simulated/floor/plating, -/area/station/engineering/engine/supermatter) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "uBD" = ( /obj/structure/cable{ d1 = 1; @@ -94171,12 +93863,6 @@ icon_state = "whitegreencorner" }, /area/station/medical/virology) -"uJs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "uJu" = ( /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /obj/structure/sign/electricshock{ @@ -94448,10 +94134,9 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "uMY" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uNf" = ( @@ -94736,8 +94421,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/execution) "uQW" = ( -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/structure/lattice, +/turf/space, +/area/station/hallway/secondary/entry) "uRf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -95008,14 +94694,6 @@ }, /turf/simulated/floor/engine, /area/station/science/test_chamber) -"uUh" = ( -/obj/machinery/door/poddoor{ - id_tag = "SpaceDropSM"; - protected = 0; - name = "SM Drop Door" - }, -/turf/simulated/floor/plating, -/area/station/engineering/engine/supermatter) "uUo" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -95295,9 +94973,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "uYk" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/atmospherics/trinary/tvalve/digital{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uYD" = ( @@ -97166,15 +96852,21 @@ icon_state = "neutralfull" }, /area/station/maintenance/starboard2) +"vJN" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/economy/atm/east, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "vJP" = ( /obj/machinery/door/airlock/external{ id_tag = "escape_door_int"; locked = 1; name = "Escape External Access" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button/east{ autolink_id = "escape_btn_int"; @@ -97210,8 +96902,22 @@ "vKB" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/ppflowers, +/obj/structure/railing{ + dir = 5 + }, /turf/simulated/floor/grass, /area/station/science/research) +"vKK" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "vLh" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -97234,9 +96940,7 @@ }, /area/station/service/bar/atrium) "vLS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/delivery/hollow, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, @@ -97779,23 +97483,19 @@ }, /area/station/medical/virology) "vVB" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "vVF" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -98191,11 +97891,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) "waQ" = ( -/obj/machinery/atmospherics/trinary/filter{ - dir = 1; - filter_type = "n2"; - name = "nitrogen filter"; - on = 1 +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -98978,18 +98677,6 @@ "wpW" = ( /turf/simulated/wall, /area/station/maintenance/dormitory_maintenance) -"wqp" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/table/reinforced, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "wqG" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "hos_room" @@ -99283,6 +98970,18 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) +"wwE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/item/radio/intercom/directional/south, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "wwR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -101274,6 +100973,11 @@ /obj/structure/railing/corner, /turf/simulated/floor/wood/fancy, /area/station/service/theatre) +"xiD" = ( +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "xjh" = ( /obj/machinery/door_control/bolt_control/north{ id = "maintcabin1" @@ -102266,18 +101970,11 @@ }, /area/station/maintenance/medmaint) "xBJ" = ( -/obj/structure/railing{ - dir = 10; - pixel_x = -6; - pixel_y = -4 - }, /obj/item/kirbyplants{ pixel_y = 7 }, -/obj/structure/railing/corner{ - dir = 5; - pixel_x = -2; - pixel_y = -28 +/obj/structure/railing{ + dir = 10 }, /turf/simulated/floor/grass, /area/station/science/research) @@ -103426,9 +103123,7 @@ /area/station/medical/sleeper) "xTK" = ( /obj/machinery/light/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/delivery/hollow, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, @@ -107298,17 +106993,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bmo +bpm +pVN +bpm +pVN +bpm +bmo +bmo +bmo +bmo +bmo aaa aaa aaa @@ -107554,6 +107249,19 @@ aaa aaa aaa aaa +bkt +bpn +brp +brp +brp +bRr +blv +blO +brp +brp +brp +cpb +bLR aaa aaa aaa @@ -107682,178 +107390,8 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(14,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(14,1,1) = {" aaa aaa aaa @@ -107952,9 +107490,6 @@ aaa aaa aaa aaa -"} -(15,1,1) = {" -aaa aaa aaa aaa @@ -107971,6 +107506,19 @@ aaa aaa aaa aaa +bku +bpo +bLM +kVT +bPC +bRs +bTs +bVH +brq +bms +bnR +bpo +brr aaa aaa aaa @@ -108099,6 +107647,8 @@ aaa aaa aaa aaa +"} +(15,1,1) = {" aaa aaa aaa @@ -108200,6 +107750,32 @@ aaa aaa aaa aaa +abj +bpm +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bmo +bPR +bpo +brr +bNM +bNM +bNM +bTt +bNM +bNM +bNM +bkt +bpo +bLR aaa aaa aaa @@ -108209,8 +107785,6 @@ aaa aaa aaa aaa -"} -(16,1,1) = {" aaa aaa aaa @@ -108330,6 +107904,8 @@ aaa aaa aaa aaa +"} +(16,1,1) = {" aaa aaa aaa @@ -108431,6 +108007,32 @@ aaa aaa aaa aaa +bku +bpn +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +brp +bJQ +brs +bNM +bPG +bRx +bTu +bVJ +ccx +bNM +bkt +lvH +brr aaa aaa aaa @@ -108466,8 +108068,6 @@ aaa aaa aaa aaa -"} -(17,1,1) = {" aaa aaa aaa @@ -108561,6 +108161,8 @@ aaa aaa aaa aaa +"} +(17,1,1) = {" aaa aaa aaa @@ -108662,7 +108264,37 @@ aaa aaa aaa aaa +ops +bpo +brq +bpu +bms +bms +rNb +bpu +bms +bms +bpu +bms +bms +bpu +bms aaa +bNM +bPH +bSr +bTv +bXI +cgI +bNM +bkt +lvH +dSz +pVN +bpm +pVN +bmo +bpm aaa aaa aaa @@ -108723,8 +108355,6 @@ aaa aaa aaa aaa -"} -(18,1,1) = {" aaa aaa aaa @@ -108788,6 +108418,8 @@ aaa aaa aaa aaa +"} +(18,1,1) = {" aaa aaa aaa @@ -108889,6 +108521,38 @@ aaa aaa aaa aaa +bkt +bpo +brr +abj +abj +abj +btd +btd +btd +btd +btd +btd +btd +btd +btd +btd +bNM +bPO +bTc +bTw +bVL +chu +bNM +bku +boe +mRz +mRz +mRz +mRz +brp +cpb +brs aaa aaa aaa @@ -108980,8 +108644,6 @@ aaa aaa aaa aaa -"} -(19,1,1) = {" aaa aaa aaa @@ -109013,6 +108675,8 @@ aaa aaa aaa aaa +"} +(19,1,1) = {" aaa aaa aaa @@ -109114,7 +108778,38 @@ aaa aaa aaa aaa +bku +bpo +brs +abj +abj +btd +btd +btd +bzv +btd +btd +btd +bvz +btd +bzv +btd +bNM +bPP +bUD +hzl +bXI +chE +bNM aaa +bpu +bms +bms +bpu +bms +bPC +bpo +brs aaa aaa aaa @@ -109340,7 +109035,38 @@ aaa aaa aaa aaa +ops +bpo +brs aaa +btd +btd +btd +bxX +bzw +btd +bCT +btd +bzw +bzD +bJR +btd +bNM +bPQ +bXm +bTI +bVN +cmx +bNM +qrT +qrT +qrT +qrT +qrT +abj +bku +bpo +brs aaa aaa aaa @@ -109463,42 +109189,8 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(21,1,1) = {" -aaa -aaa -aaa +"} +(21,1,1) = {" aaa aaa aaa @@ -109600,6 +109292,38 @@ aaa aaa aaa aaa +bku +bpo +brr +abj +btd +btd +bwG +bxY +byg +bBd +bCU +bwG +bBf +bxY +bBf +tEw +bNM +bNM +bNM +bTz +bNM +bNM +bNM +qrT +qrT +qrT +qrT +qrT +qrT +bkt +bpo +brs aaa aaa aaa @@ -109722,6 +109446,8 @@ aaa aaa aaa aaa +"} +(22,1,1) = {" aaa aaa aaa @@ -109751,8 +109477,6 @@ aaa aaa aaa aaa -"} -(22,1,1) = {" aaa aaa aaa @@ -109824,7 +109548,40 @@ aaa aaa aaa aaa +bmo +bnM +bpo +brs aaa +btd +bvz +bLQ +bxZ +bzy +bIh +bCV +bIh +bIh +bIh +bJS +bwH +bNN +bPI +bVO +bTG +bVO +bPI +bNM +qrT +rSI +vzz +eaH +qrT +qrT +bkt +bpo +bLS +bmo aaa aaa aaa @@ -109946,6 +109703,8 @@ aaa aaa aaa aaa +"} +(23,1,1) = {" aaa aaa aaa @@ -110008,8 +109767,6 @@ aaa aaa aaa aaa -"} -(23,1,1) = {" aaa aaa aaa @@ -110047,6 +109804,42 @@ aaa aaa aaa aaa +bkt +bmp +cqK +bpq +brr +btd +btd +btd +bBg +bye +bzz +bBf +bEF +bBf +bBf +bgN +bJT +bLO +bNM +bPJ +bRz +bTB +bVS +bXH +bNM +caV +caW +fmm +fmm +chX +qrT +bku +bmq +cqK +csk +brs aaa aaa aaa @@ -110125,17 +109918,6 @@ aaa aaa aaa aaa -bmo -bpm -pVN -bpm -pVN -bpm -bmo -bmo -bmo -bmo -bmo aaa aaa aaa @@ -110178,6 +109960,8 @@ aaa aaa aaa aaa +"} +(24,1,1) = {" aaa aaa aaa @@ -110265,8 +110049,6 @@ aaa aaa aaa aaa -"} -(24,1,1) = {" aaa aaa aaa @@ -110279,6 +110061,42 @@ aaa aaa aaa aaa +bku +bmq +bnO +bpq +brs +btd +btd +byg +bBf +bye +bBf +btd +btd +bIi +naX +bwJ +bhV +bNL +bNM +bSo +bVS +bTE +bVS +bXI +qrT +ccU +caW +ceP +fmm +fBl +qrT +bkt +bmq +cqL +bpq +brs aaa aaa aaa @@ -110381,19 +110199,6 @@ aaa aaa aaa aaa -bkt -bpn -brp -brp -brp -bRr -blv -blO -brp -brp -brp -cpb -bLR aaa aaa aaa @@ -110412,6 +110217,8 @@ aaa aaa aaa aaa +"} +(25,1,1) = {" aaa aaa aaa @@ -110511,6 +110318,42 @@ aaa aaa aaa aaa +bkt +bav +bnP +btk +nLK +btd +btd +bwF +bwK +byc +bCY +btd +bCX +bEE +btd +bIj +bJU +biX +bNP +bPL +bRB +bTD +bVR +bXJ +bZh +caX +boh +cgu +ccW +chW +qrT +jnD +bav +bnP +btk +brs aaa aaa aaa @@ -110522,8 +110365,6 @@ aaa aaa aaa aaa -"} -(25,1,1) = {" aaa aaa aaa @@ -110633,24 +110474,13 @@ aaa aaa aaa aaa +"} +(26,1,1) = {" aaa aaa aaa aaa aaa -bku -bpo -bLM -kVT -bPC -bRs -bTs -bVH -brq -bms -bnR -bpo -brr aaa aaa aaa @@ -110745,6 +110575,42 @@ aaa aaa aaa aaa +bku +baE +bcA +bdZ +brs +btd +btd +bvC +bwJ +byd +bBf +btd +btd +bIk +naX +bwJ +bJV +bBf +bNM +bXI +bVS +bTE +bVS +bXI +oMr +caY +ccX +ceP +fmm +vDg +qrT +bkt +brT +bsb +btx +brs aaa aaa aaa @@ -110779,8 +110645,6 @@ aaa aaa aaa aaa -"} -(26,1,1) = {" aaa aaa aaa @@ -110867,6 +110731,8 @@ aaa aaa aaa aaa +"} +(27,1,1) = {" aaa aaa aaa @@ -110882,32 +110748,6 @@ aaa aaa aaa aaa -abj -bpm -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bmo -bPR -bpo -brr -bNM -bNM -bNM -bTt -bNM -bNM -bNM -bkt -bpo -bLR aaa aaa aaa @@ -110992,6 +110832,42 @@ aaa aaa aaa aaa +ops +bmr +cqM +bps +brr +btd +btd +btd +bCW +byd +bzA +bBf +bED +bBf +bBf +bIl +bip +bBf +bNM +bPJ +bRD +bTF +bVS +bXK +bNM +caV +ccX +fmm +fmm +chX +qrT +bku +cpd +cqM +csl +brs aaa aaa aaa @@ -111036,8 +110912,6 @@ aaa aaa aaa aaa -"} -(27,1,1) = {" aaa aaa aaa @@ -111114,6 +110988,8 @@ aaa aaa aaa aaa +"} +(28,1,1) = {" aaa aaa aaa @@ -111139,32 +111015,6 @@ aaa aaa aaa aaa -bku -bpn -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -brp -bJQ -brs -bNM -bPG -bRx -bTu -bVJ -ccx -bNM -bkt -lvH -brr aaa aaa aaa @@ -111239,7 +111089,41 @@ aaa aaa aaa aaa +abj +oMO +fPS +bJP +brs aaa +btd +bvz +bLQ +byf +bzB +bIm +bCZ +bIm +bIm +bIm +bJW +bwH +bNR +bPI +bVT +bTG +bVT +bXL +bNM +qrT +bon +ceL +hng +qrT +qrT +bkt +bJP +orz +bpu aaa aaa aaa @@ -111293,8 +111177,6 @@ aaa aaa aaa aaa -"} -(28,1,1) = {" aaa aaa aaa @@ -111363,6 +111245,8 @@ aaa aaa aaa aaa +"} +(29,1,1) = {" aaa aaa aaa @@ -111396,37 +111280,7 @@ aaa aaa aaa aaa -ops -bpo -brq -bpu -bms -bms -rNb -bpu -bms -bms -bpu -bms -bms -bpu -bms aaa -bNM -bPH -bSr -bTv -bXI -cgI -bNM -bkt -lvH -dSz -pVN -bpm -pVN -bmo -bpm aaa aaa aaa @@ -111494,6 +111348,38 @@ aaa aaa aaa aaa +bku +bJP +brr +abj +btd +btd +bwG +byg +bIn +bBd +bCU +bwG +bBf +bIn +bBf +uVE +bNM +bNM +bNM +bTH +bNM +bNM +bNM +qrT +qrT +qrT +qrT +qrT +qrT +bkt +bJP +brr aaa aaa aaa @@ -111550,8 +111436,6 @@ aaa aaa aaa aaa -"} -(29,1,1) = {" aaa aaa aaa @@ -111618,6 +111502,8 @@ aaa aaa aaa aaa +"} +(30,1,1) = {" aaa aaa aaa @@ -111653,38 +111539,6 @@ aaa aaa aaa aaa -bkt -bpo -brr -abj -abj -abj -btd -btd -btd -btd -btd -btd -btd -btd -btd -btd -bNM -bPO -bTc -bTw -bVL -chu -bNM -bku -boe -mRz -mRz -mRz -mRz -brp -cpb -brs aaa aaa aaa @@ -111751,7 +111605,38 @@ aaa aaa aaa aaa +bkt +bJP +brs aaa +btd +btd +btd +byh +bzD +btd +bDa +btd +bGq +bIo +bzw +btd +bNM +bPN +bVj +bTI +bVU +bPN +bNM +qrT +qrT +qrT +qrT +qrT +abj +bku +bJP +bLR aaa aaa aaa @@ -111807,8 +111692,6 @@ aaa aaa aaa aaa -"} -(30,1,1) = {" aaa aaa aaa @@ -111876,6 +111759,8 @@ aaa aaa aaa aaa +"} +(31,1,1) = {" aaa aaa aaa @@ -111910,64 +111795,6 @@ aaa aaa aaa aaa -bku -bpo -brs -abj -abj -btd -btd -btd -bzv -btd -btd -btd -bvz -btd -bzv -btd -bNM -bPP -bUD -hzl -bXI -chE -bNM -aaa -bpu -bms -bms -bpu -bms -bPC -bpo -brs -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -112014,6 +111841,7 @@ aaa aaa aaa aaa +lVg aaa aaa aaa @@ -112034,7 +111862,38 @@ aaa aaa aaa aaa +bkt +bJP +brs +abj +abj +btd +btd +btd +bzv +btd +btd +btd +bvz +btd +bzv +btd +bNM +bQC +bXI +bTL +bXI +bXM +bNM aaa +bpm +bmo +bmo +bpm +bmo +cnY +bJP +brr aaa aaa aaa @@ -112064,8 +111923,6 @@ aaa aaa aaa aaa -"} -(31,1,1) = {" aaa aaa aaa @@ -112146,7 +112003,6 @@ aaa aaa aaa aaa -lVg aaa aaa aaa @@ -112160,6 +112016,8 @@ aaa aaa aaa aaa +"} +(32,1,1) = {" aaa aaa aaa @@ -112167,38 +112025,7 @@ aaa aaa aaa aaa -ops -bpo -brs aaa -btd -btd -btd -bxX -bzw -btd -bCT -btd -bzw -bzD -bJR -btd -bNM -bPQ -bXm -bTI -bVN -cmx -bNM -qrT -qrT -qrT -qrT -qrT -abj -bku -bpo -brs aaa aaa aaa @@ -112292,6 +112119,38 @@ aaa aaa aaa aaa +bkt +bJP +brr +abj +abj +abj +btd +btd +btd +btd +btd +btd +btd +btd +btd +btd +bNM +bQD +bjE +bTK +bXI +bXN +bNM +bku +bJO +pDS +pDS +pDS +pDS +chS +cpe +brs aaa aaa aaa @@ -112321,8 +112180,6 @@ aaa aaa aaa aaa -"} -(32,1,1) = {" aaa aaa aaa @@ -112416,6 +112273,8 @@ aaa aaa aaa aaa +"} +(33,1,1) = {" aaa aaa aaa @@ -112424,38 +112283,6 @@ aaa aaa aaa aaa -bku -bpo -brr -abj -btd -btd -bwG -bxY -byg -bBd -bCU -bwG -bBf -bxY -bBf -tEw -bNM -bNM -bNM -bTz -bNM -bNM -bNM -qrT -qrT -qrT -qrT -qrT -qrT -bkt -bpo -brs aaa aaa aaa @@ -112549,7 +112376,37 @@ aaa aaa aaa aaa +bkt +bJP +brw +bpm +bmo +bmo +uDR +bpm +bmo +bmo +bpm +bmo +bmo +bpm +bmo aaa +bNM +bRt +bXI +bTL +bXI +bXO +bNM +bkt +eHx +orz +oMO +bpu +bms +bms +bms aaa aaa aaa @@ -112578,8 +112435,6 @@ aaa aaa aaa aaa -"} -(33,1,1) = {" aaa aaa aaa @@ -112675,45 +112530,14 @@ aaa aaa aaa aaa +"} +(34,1,1) = {" aaa aaa aaa aaa aaa -bmo -bnM -bpo -brs aaa -btd -bvz -bLQ -bxZ -bzy -bIh -bCV -bIh -bIh -bIh -bJS -bwH -bNN -bPI -bVO -bTG -bVO -bPI -bNM -qrT -rSI -vzz -eaH -qrT -qrT -bkt -bpo -bLS -bmo aaa aaa aaa @@ -112809,6 +112633,32 @@ aaa aaa aaa aaa +bku +bJY +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +chS +bJX +brs +bNM +bPN +czz +blG +bmS +bXP +bNM +bkt +bJP +brr aaa aaa aaa @@ -112835,8 +112685,6 @@ aaa aaa aaa aaa -"} -(34,1,1) = {" aaa aaa aaa @@ -112936,45 +112784,11 @@ aaa aaa aaa aaa -bkt -bmp -cqK -bpq -brr -btd -btd -btd -bBg -bye -bzz -bBf -bEF -bBf -bBf -bgN -bJT -bLO -bNM -bPJ -bRz -bTB -bVS -bXH -bNM -caV -caW -fmm -fmm -chX -qrT -bku -bmq -cqK -csk -brs aaa aaa aaa +"} +(35,1,1) = {" aaa aaa aaa @@ -113076,6 +112890,32 @@ aaa aaa aaa aaa +abj +bpu +oMO +bms +bms +bms +bms +bms +bms +bms +bms +bms +bpu +fPS +bJP +bLR +bNM +bNM +bNM +bTM +bNM +bNM +bNM +bku +bJP +brs aaa aaa aaa @@ -113092,8 +112932,6 @@ aaa aaa aaa aaa -"} -(35,1,1) = {" aaa aaa aaa @@ -113193,42 +113031,6 @@ aaa aaa aaa aaa -bku -bmq -bnO -bpq -brs -btd -btd -byg -bBf -bye -bBf -btd -btd -bIi -naX -bwJ -bhV -bNL -bNM -bSo -bVS -bTE -bVS -bXI -qrT -ccU -caW -ceP -fmm -fBl -qrT -bkt -bmq -cqL -bpq -brs aaa aaa aaa @@ -113242,6 +113044,8 @@ aaa aaa aaa aaa +"} +(36,1,1) = {" aaa aaa aaa @@ -113349,8 +113153,6 @@ aaa aaa aaa aaa -"} -(36,1,1) = {" aaa aaa aaa @@ -113358,6 +113160,20 @@ aaa aaa aaa aaa +bku +bJP +bLS +wdm +bPR +bRJ +bTN +bVV +brw +bmo +bnM +bJP +brs +aaa aaa aaa aaa @@ -113450,42 +113266,6 @@ aaa aaa aaa aaa -bkt -bav -bnP -btk -nLK -btd -btd -bwF -bwK -byc -bCY -btd -bCX -bEE -btd -bIj -bJU -biX -bNP -bPL -bRB -bTD -bVR -bXJ -bZh -caX -boh -cgu -ccW -chW -qrT -jnD -bav -bnP -btk -brs aaa aaa aaa @@ -113521,6 +113301,8 @@ aaa aaa aaa aaa +"} +(37,1,1) = {" aaa aaa aaa @@ -113606,8 +113388,6 @@ aaa aaa aaa aaa -"} -(37,1,1) = {" aaa aaa aaa @@ -113637,6 +113417,23 @@ aaa aaa aaa aaa +bkt +bJY +bLT +chS +chS +bVW +bTO +bVW +chS +chS +chS +cpe +brs +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113685,7 +113482,9 @@ aaa aaa aaa aaa +acF aaa +acF aaa aaa aaa @@ -113707,42 +113506,6 @@ aaa aaa aaa aaa -bku -baE -bcA -bdZ -brs -btd -btd -bvC -bwJ -byd -bBf -btd -btd -bIk -naX -bwJ -bJV -bBf -bNM -bXI -bVS -bTE -bVS -bXI -oMr -caY -ccX -ceP -fmm -vDg -qrT -bkt -brT -bsb -btx -brs aaa aaa aaa @@ -113787,9 +113550,7 @@ aaa aaa aaa aaa -acF aaa -acF aaa aaa aaa @@ -113797,6 +113558,8 @@ aaa aaa aaa aaa +"} +(38,1,1) = {" aaa aaa aaa @@ -113863,8 +113626,6 @@ aaa aaa aaa aaa -"} -(38,1,1) = {" aaa aaa aaa @@ -113914,6 +113675,18 @@ aaa aaa aaa aaa +fPS +bLU +bLM +bPC +bmq +bTS +bpq +brq +oMO +bpu +oMO +abj aaa aaa aaa @@ -113964,45 +113737,11 @@ aaa aaa aaa aaa -ops -bmr -cqM -bps -brr -btd -btd -btd -bCW -byd -bzA -bBf -bED -bBf -bBf -bIl -bip -bBf -bNM -bPJ -bRD -bTF -bVS -bXK -bNM -caV -ccX -fmm -fmm -chX -qrT -bku -cpd -cqM -csl -brs aaa aaa +abj aaa +abj aaa aaa aaa @@ -114044,9 +113783,7 @@ aaa aaa aaa aaa -abj aaa -abj aaa aaa aaa @@ -114078,6 +113815,8 @@ aaa aaa aaa aaa +"} +(39,1,1) = {" aaa aaa aaa @@ -114120,8 +113859,6 @@ aaa aaa aaa aaa -"} -(39,1,1) = {" aaa aaa aaa @@ -114195,6 +113932,14 @@ aaa aaa aaa aaa +bku +bLV +brr +bku +bRL +bTQ +bmY +brr aaa aaa aaa @@ -114221,41 +113966,7 @@ aaa aaa aaa aaa -abj -oMO -fPS -bJP -brs aaa -btd -bvz -bLQ -byf -bzB -bIm -bCZ -bIm -bIm -bIm -bJW -bwH -bNR -bPI -bVT -bTG -bVT -bXL -bNM -qrT -bon -ceL -hng -qrT -qrT -bkt -bJP -orz -bpu aaa aaa aaa @@ -114284,7 +113995,11 @@ aaa aaa aaa aaa +abj +abj aaa +abj +abj aaa aaa aaa @@ -114300,11 +114015,7 @@ aaa aaa aaa aaa -abj -abj aaa -abj -abj aaa aaa aaa @@ -114361,6 +114072,8 @@ aaa aaa aaa aaa +"} +(40,1,1) = {" aaa aaa aaa @@ -114377,8 +114090,6 @@ aaa aaa aaa aaa -"} -(40,1,1) = {" aaa aaa aaa @@ -114479,38 +114190,12 @@ aaa aaa aaa aaa +bUJ aaa bku -bJP -brr -abj -btd -btd -bwG -byg -bIn -bBd -bCU -bwG -bBf -bIn -bBf -uVE -bNM -bNM -bNM -bTH -bNM -bNM -bNM -qrT -qrT -qrT -qrT -qrT -qrT -bkt -bJP +bmq +bTR +bpq brr aaa aaa @@ -114556,6 +114241,16 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj abj dyo @@ -114737,38 +114432,38 @@ aaa aaa aaa aaa -bkt -bJP -brs aaa -btd -btd -btd -byh -bzD -btd -bDa -btd -bGq -bIo -bzw -btd -bNM -bPN -bVj -bTI -bVU -bPN -bNM -qrT -qrT -qrT -qrT -qrT -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bUJ +aaa bku -bJP -bLR +bmq +bTS +bpq +brr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114994,38 +114689,38 @@ aaa aaa aaa aaa -bkt -bJP -brs -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bUJ abj -btd -btd -btd -bzv -btd -btd -btd -bvz -btd -bzv -btd -bNM -bQC -bXI -bTL -bXI -bXM -bNM +bPS +bRM +bTT +bVX +bPS +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -bpm -bmo -bmo -bpm -bmo -cnY -bJP -brr aaa aaa aaa @@ -115251,38 +114946,38 @@ aaa aaa aaa aaa -bkt -bJP -brr -abj -abj -abj -btd -btd -btd -btd -btd -btd -btd -btd -btd -btd -bNM -bQD -bjE -bTK -bXI -bXN -bNM +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bUJ +aaa bku -bJO -pDS -pDS -pDS -pDS -chS -cpe -brs +bRN +bTU +bVY +brr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -115508,37 +115203,37 @@ aaa aaa aaa aaa -bkt -bJP -brw -bpm -bmo -bmo -uDR -bpm -bmo -bmo -bpm -bmo -bmo -bpm -bmo aaa -bNM -bRt -bXI -bTL -bXI -bXO -bNM -bkt -eHx -orz -oMO -bpu -bms +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bUJ +aaa +bPU bms +bZw bms +bXR +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -115765,32 +115460,32 @@ aaa aaa aaa aaa -bku -bJY -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -chS -bJX -brs -bNM -bPN -czz -blG -bmS -bXP -bNM -bkt -bJP -brr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bUJ +abj +bPV +abj +chw +abj +bPV +aaa +aaa +aaa +aaa aaa aaa aaa @@ -116022,32 +115717,32 @@ aaa aaa aaa aaa -abj -bpu -oMO -bms -bms -bms -bms -bms -bms -bms -bms -bms -bpu -fPS -bJP -bLR -bNM -bNM -bNM -bTM -bNM -bNM -bNM -bku -bJP -brs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bUJ +aaa +bPW +wXe +chw +wXe +bXS +aaa +aaa +aaa +aaa aaa aaa aaa @@ -116096,31 +115791,38 @@ aaa aaa aaa aaa -abj -abj -dyo -dyo -dCA -dAH -dEK -dyo -dyo -abj -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj +abj +dyo +dyo +dCA +dAH +dEK +dyo +dyo +abj +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -116169,6 +115871,8 @@ aaa aaa aaa aaa +"} +(47,1,1) = {" aaa aaa aaa @@ -116176,8 +115880,6 @@ aaa aaa aaa aaa -"} -(47,1,1) = {" aaa aaa aaa @@ -116287,24 +115989,17 @@ aaa aaa aaa aaa +bUJ aaa +abj +bRQ +chw +bWb +abj aaa aaa aaa aaa -bku -bJP -bLS -wdm -bPR -bRJ -bTN -bVV -brw -bmo -bnM -bJP -brs aaa aaa aaa @@ -116549,19 +116244,19 @@ aaa aaa aaa aaa -bkt -bJY -bLT -chS -chS -bVW -bTO -bVW -chS -chS -chS -cpe -brs +aaa +aaa +bUJ +aaa +abj +wXe +cnH +wXe +abj +aaa +aaa +aaa +aaa aaa aaa aaa @@ -116807,17 +116502,13 @@ aaa aaa aaa aaa -fPS -bLU -bLM -bPC -bmq -bTS -bpq -brq -oMO -bpu -oMO +aaa +bVf +bXG +bYl +abj +coi +abj abj aaa aaa @@ -116870,6 +116561,10 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa abj abj aaa @@ -117064,14 +116759,14 @@ aaa aaa aaa aaa -bku -bLV -brr -bku -bRL -bTQ -bmY -brr +aaa +abj +aaa +bUJ +aaa +csr +aaa +abj aaa aaa aaa @@ -117322,13 +117017,13 @@ aaa aaa aaa aaa +abj +aaa bUJ aaa -bku -bmq -bTR -bpq -brr +csr +aaa +abj aaa aaa aaa @@ -117579,13 +117274,13 @@ aaa aaa aaa aaa +abj +abj bUJ -aaa -bku -bmq -bTS -bpq -brr +abj +coi +abj +abj aaa aaa aaa @@ -117836,13 +117531,13 @@ aaa aaa aaa aaa +abj +aaa bUJ +aaa +csr +aaa abj -bPS -bRM -bTT -bVX -bPS aaa aaa aaa @@ -118082,6 +117777,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -118092,14 +117788,13 @@ aaa aaa aaa aaa +abj aaa bUJ aaa -bku -bRN -bTU -bVY -brr +csr +aaa +abj aaa aaa aaa @@ -118350,13 +118045,13 @@ aaa aaa aaa aaa +abj +abj bUJ -aaa -bPU -bms -bZw -bms -bXR +abj +coi +abj +abj aaa aaa aaa @@ -118607,13 +118302,13 @@ aaa aaa aaa aaa -bUJ abj -bPV -abj -chw +aaa +bUJ +aaa +csr +aaa abj -bPV aaa aaa aaa @@ -118864,13 +118559,13 @@ aaa aaa aaa aaa +abj +aaa bUJ aaa -bPW -wXe -chw -wXe -bXS +csr +aaa +abj aaa aaa aaa @@ -119121,12 +118816,12 @@ aaa aaa aaa aaa +abj +abj bUJ -aaa abj -bRQ -chw -bWb +coi +abj abj aaa aaa @@ -119377,15 +119072,14 @@ aaa aaa aaa aaa +aaZ +abj aaa bUJ aaa -abj -wXe -cnH -wXe -abj +csr aaa +abj aaa aaa aaa @@ -119396,6 +119090,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -119635,14 +119330,13 @@ aaa aaa aaa aaa -bVf -bXG -bYl -abj -coi abj abj +bUJ +aaa +csr aaa +abj aaa aaa aaa @@ -119665,6 +119359,7 @@ aaa aaa dmq dmq +dmq cHA cHA cHA @@ -120095,62 +119790,62 @@ aaa aaa aaa aaa -dij +dij +aaa +ash +ata +atY +aaa +ash +ata +atY +aaa +ash +ata +atY +aaa +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -ash -ata -atY -aaa -ash -ata -atY -aaa -ash -ata -atY aaa +dij abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa bUJ aaa csr @@ -123539,7 +123234,7 @@ dcM daf lTi dhv -duT +lYq dYm lTi dmM @@ -124985,16 +124680,16 @@ abj dij atd avx -wqp +axW ePt rAC rAC -ocA -pJw -nUR -nUR +aBX +axN +aLw +aLw rAC -vVB +mxG aHa aIz aJR @@ -125241,24 +124936,24 @@ aaa abj dij atd -mPO +ayO aFd axI aFd -kuJ -tUw -sQZ -bnK +ltw +oeZ +jhJ +tCX dFZ aFd -jqX +pSJ atd -lWo -oql +fjw +mPO hLA hxO aOb -iqR +kqp brz pxC hEc @@ -125498,18 +125193,18 @@ aaa abj abj atd -oAP -uQW -uMY -ayT -kJd -ufU -iyC -ayO -aJF -waQ -aMJ -pSJ +kXZ +oCV +aJU +iqR +gBo +aDh +jhz +qdk +tQK +tzp +uYk +aIA leZ aJS hgs @@ -125755,18 +125450,18 @@ aaa dij abj atd -aCV -uQW -aCi -uQW -eFV +tep oCV -gBo -uQW -onA izz -qEN -uJs +oCV +pJw +jhG +jqX +oCV +qdE +oKV +syc +uMY leZ leZ vHD @@ -125808,7 +125503,7 @@ bOe bUl bRZ bUl -axK +bIq bXU fEo cbi @@ -126014,17 +125709,17 @@ abj axl avI awI -avE +hGx hwu -kur +xiD hwu -kur +xiD hwu -kur +xiD hwu gba aJH -qWG +aCi lZR aLs aML @@ -126270,8 +125965,8 @@ raB aaa axl avI -dFi -axJ +uoQ +uBp aCp ayV aCS @@ -126281,13 +125976,13 @@ aHc aHc uly fhC -aID +aIB kAG aLu aMM aOj aUM -tzp +nIM aSD uQB aVF @@ -126528,20 +126223,20 @@ aaa axl avI hwu -axL +axK ayL azT -uBp +rfT azT ayP aCj aDf aFe aHh -aID +aIB aCk -oKV -uYk +fCZ +bnK aOg mMM aQT @@ -126784,8 +126479,8 @@ dij aaa auG avC -kur -axM +xiD +axJ ayM aAd aAd @@ -126795,7 +126490,7 @@ aCj aEf aFf aHl -aIE +waQ atd aLp atd @@ -126814,7 +126509,7 @@ aXo aXo bhl biR -bkM +jtK bmB bnX tkz @@ -126962,7 +126657,7 @@ aaa aaa aaa aaa -abj +aaa aaa aaa aaa @@ -127045,14 +126740,14 @@ iVF axO ayM pyQ -mxG +tEe sqD ksd ayM aFg wBz aHh -aIF +aID atd wgY eMw @@ -127071,7 +126766,7 @@ oHi aOb bhk tBD -bkM +jtK bmC aYK bpH @@ -127219,7 +126914,7 @@ aaa aaa aaa aaa -sso +aaa aaa aaa aaa @@ -127300,7 +126995,7 @@ vOo hwu hwu axP -uUh +rwj azZ azZ azZ @@ -127328,7 +127023,7 @@ beM bgf bhn biS -bkM +jtK bmD bnY bpI @@ -127475,9 +127170,9 @@ aaa aaa aaa aaa -abj -fOs -abj +aaa +aaa +aaa aaa aaa aaa @@ -127556,10 +127251,10 @@ aaa sdI qhe qhe -aPy -uUh +axM +rwj aAa -lqL +oAP aAa mxm aAa @@ -127572,8 +127267,8 @@ glw sfh aOm aTT -tQK -aJU +vVB +pAQ cwX aVI aOb @@ -127585,7 +127280,7 @@ dOB aOb bhk aZm -bkM +jtK bmE bnZ bpJ @@ -127731,10 +127426,10 @@ aaa aaa aaa aaa -raB -fOs -sso -fOs +aaa +aaa +aaa +aaa aaa aaa aaa @@ -127814,16 +127509,16 @@ vOo hwu hwu axP -uUh +rwj aAb aAb aAb duJ -pYc +ayJ pcM gwO wQE -iZL +aEd lZR stW hiq @@ -127988,11 +127683,11 @@ aaa aaa aaa aaa -abj -fOs -abj -abj -abj +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -128080,7 +127775,7 @@ ayM ayM oVs aHh -eEd +wwE atd jMo rbo @@ -128088,7 +127783,7 @@ aOg aPG aQT aSD -kaO +onA aVI aXq bbR @@ -128246,8 +127941,8 @@ aaa aaa aaa aaa -abj -fOs +aaa +aaa aaa aaa aaa @@ -128326,8 +128021,8 @@ raB abj auG avC -kur -axN +xiD +axR ayM aAd aAd @@ -128337,7 +128032,7 @@ aDc aEj aGa aHl -oan +iZL atd atd atd @@ -128584,7 +128279,7 @@ aaa axl avI hwu -axL +axK ayP aBf aBf @@ -128594,7 +128289,7 @@ aDc aEj aFi aHm -oeZ +eEd aJY aLv kNF @@ -128613,7 +128308,7 @@ aXN ijT mzZ ban -bkM +jtK bmI wkD wkD @@ -128851,9 +128546,9 @@ aFV aFV dEE hox -tep +oan oox -aLw +aSH pJP aOg vRU @@ -128870,7 +128565,7 @@ tiC bgg ban ban -bkM +jtK mtt wkD sgF @@ -129107,10 +128802,10 @@ aDd aEm aFj rfH -mZv +vKK aMM kzE -nRx +tUw oHK aOg aQZ @@ -129612,11 +129307,11 @@ abj aaa atd atd -aBX -rwj -kqp -rfT -jhG +lWo +nRx +aIF +pYc +nUm fpf qOQ vHB @@ -129628,7 +129323,7 @@ atd atd aOg aOg -aHG +aIE aSL aUh aPH @@ -130131,7 +129826,7 @@ hEn hEn aaa aaa -tEe +eiU aaa aaa aaa @@ -130388,7 +130083,7 @@ hEn hEn aaa aaa -tEe +eiU aaa aaa aaa @@ -132404,8 +132099,8 @@ acC aef aef acC -qdE -qdE +uQW +uQW abj abj abj @@ -132669,7 +132364,7 @@ aaa aaa aaa wXe -qdE +uQW acC acC acC @@ -133694,7 +133389,7 @@ aeb eCj aeb aeb -aiE +vJN agB aeb aeb @@ -134211,13 +133906,13 @@ wXe rkU aaa wXe -qdE +uQW acC acC acC acC acC -aIA +aJF rkU wXe rkU @@ -134715,11 +134410,9 @@ aaa aaa aaa aaa -wXe -aIy -wXe -rkU +acF aaa +abj aaa aaa aaa @@ -134736,8 +134429,10 @@ aaa aaa aaa aaa -wXe -rkU +aaa +aaa +abj +aaa acC ant anP @@ -134972,11 +134667,9 @@ aaa aaa aaa aaa -wXe -aIy -wXe -rkU +acF aaa +abj aaa aaa aaa @@ -134993,8 +134686,10 @@ aaa aaa aaa aaa -wXe -rkU +aaa +aaa +abj +aaa acC ant jTD @@ -135229,11 +134924,9 @@ aaa aaa aaa aaa -wXe -aIy -wXe -rkU +acF aaa +abj aaa aaa aaa @@ -135250,8 +134943,10 @@ aaa aaa aaa aaa -wXe -rkU +aaa +aaa +abj +aaa acC ant anP @@ -135532,7 +135227,7 @@ plj tNm ipz dDJ -dBq +jJh dBq dBq fTl @@ -138102,7 +137797,7 @@ gOP yed fZX aGy -tCb +cnC rza efP dDJ @@ -138364,7 +138059,7 @@ aIY aOE xvo tJO -aOE +tJO xvo xvo rqv @@ -138432,7 +138127,7 @@ cND cKT cNG cPr -ozX +dLB cPn cZx cVd @@ -138689,7 +138384,7 @@ cKA cKT cSu pGk -mwn +dLB cSp cTQ cVr @@ -138762,7 +138457,7 @@ aaa aaa aaa aaa -aaa +dWf aaa aaa aaa @@ -139203,7 +138898,7 @@ cKC cKT ncs xBJ -hwg +dLB cSt cTT cVt @@ -139714,7 +139409,7 @@ lmt bIG cJa cKF -cSr +cKT cNJ cPt ckI @@ -139805,7 +139500,7 @@ aaa aaa aaa aaa -dWf +aaa aaa aaa aaa @@ -149160,7 +148855,7 @@ aaa eNt xha bWr -hHW +tCb uOa bWr gbO @@ -149417,7 +149112,7 @@ aaa eNt xKE bwA -rdb +web bWr shB frN From 59e1fabf45b83daff6eda751422f7149dbc01a90 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 04:58:47 +0500 Subject: [PATCH 06/14] Map_Fix_AND_Resrpite_Button --- _maps/map_files220/delta/delta.dmm | 25 +++++------------- modular_ss220/sm_space_drop/code/sm_button.dm | 2 +- .../sm_space_drop/icons/sm_buttons.dmi | Bin 417 -> 454 bytes 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 07408438155c..c3e8aa656f2f 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -4758,7 +4758,7 @@ "ayJ" = ( /obj/machinery/atmospherics/binary/valve/digital, /obj/machinery/driver_button/sm_drop_button{ - pixel_y = -16; + pixel_y = -17; pixel_x = 8; range = 20 }, @@ -60049,9 +60049,6 @@ icon_state = "yellow" }, /area/station/engineering/break_room) -"iWM" = ( -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) "iWV" = ( /obj/effect/spawner/lootdrop/trash, /obj/structure/sign/poster/official/random/north, @@ -71246,14 +71243,6 @@ icon_state = "whitebluecorner" }, /area/station/medical/reception) -"mTu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/secondary/entry) "mTw" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/wood/oak, @@ -132371,8 +132360,8 @@ acC acC acC acC -iWM -iWM +afb +afb acC aaa aaa @@ -132860,7 +132849,7 @@ aaa aaa aaa aaa -acC +aaa acC acC acC @@ -132890,7 +132879,7 @@ aip adZ pOi adZ -mTu +adZ amL bKz wSO @@ -133117,7 +133106,7 @@ aaa aaa aaa aaa -nXF +aaa nXF pUC rtH @@ -133374,7 +133363,7 @@ aaa aaa aaa aaa -acC +aaa acC acC acC diff --git a/modular_ss220/sm_space_drop/code/sm_button.dm b/modular_ss220/sm_space_drop/code/sm_button.dm index 87166c1efee1..95fca3a9b4da 100644 --- a/modular_ss220/sm_space_drop/code/sm_button.dm +++ b/modular_ss220/sm_space_drop/code/sm_button.dm @@ -38,4 +38,4 @@ launch_sequence() /obj/machinery/driver_button/drop_sm/multitool_act(mob/user, obj/item/I) - return FALSE + return FALSE diff --git a/modular_ss220/sm_space_drop/icons/sm_buttons.dmi b/modular_ss220/sm_space_drop/icons/sm_buttons.dmi index 8cf7cbd7e3d58d6e2acac5f0719f4818c33ce250..54f1969994ea7f14f12e23fe55e9a7e2209fb62b 100644 GIT binary patch delta 252 zcmZ3;e2jU5g^a5;`~RC_YMREDw$aA_jsG(ki{B7GaNt1S!I=>gL*~`*_jGX#$!L6g z(~-A1K%nKJ`@F_$PNF6&Tbr8LSdTLEaU?KsdN{;|A3T?Ms`bzP(o5#IwS&1B7#P;A z*x7!&vNBUnvHHLn@7(r>zissOw@NSf|K_m0)8>C|%!W5VTVFqXQh0FFbMbZUlaI4L zo)WL|Ir2~QzVrHDJ_X$e>kF-IeZy$X4m1x48tgZJXN-LCj=5_u{|Tm@@;$}Ba-+m{ x{BF=G0E%D8yH>Y=`%bL`SR_FnsNq2AUxp70-R?--+g}ATz|+;wWt~$(69D#kau@&r delta 215 zcmV;|04V>)1EB+uI2rHf51J-lkcNl9{mHZ&r%-k_Ua$7yi0lhi_-j@6pX&){c2ij From 087d65e774140024ef3b3f38c023905fa2ac1321 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 05:33:43 +0500 Subject: [PATCH 07/14] Resprite_Button --- _maps/map_files220/delta/delta.dmm | 9 +++++++-- .../sm_space_drop/icons/sm_buttons.dmi | Bin 454 -> 958 bytes 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index c3e8aa656f2f..0a110a2ae65e 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -4758,8 +4758,8 @@ "ayJ" = ( /obj/machinery/atmospherics/binary/valve/digital, /obj/machinery/driver_button/sm_drop_button{ - pixel_y = -17; - pixel_x = 8; + pixel_y = -14; + pixel_x = 16; range = 20 }, /turf/simulated/floor/engine, @@ -5986,6 +5986,11 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, +/obj/machinery/driver_button/sm_drop_button{ + pixel_y = -14; + pixel_x = 16; + range = 20 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, diff --git a/modular_ss220/sm_space_drop/icons/sm_buttons.dmi b/modular_ss220/sm_space_drop/icons/sm_buttons.dmi index 54f1969994ea7f14f12e23fe55e9a7e2209fb62b..a01b22adffc989bdbda9cf859d6a75e081c21887 100644 GIT binary patch literal 958 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQZ-c}5hX6E#mPmP1tppJc?=8{ zbArPPib}tK2`>2f^@*0ZuGYCT=Yuzd8eBAf@JQ#pkLJk$AjkOOqca|7ea>q%7Ib+F zc?XH+h)yXI^8P%@IH-G)m)DdX7Qsf{T|iNuofen7go=X|b9lCPp0v2CrM=_VPK_Nu zs)`sHV*Y5}jI~d?#lXPy*VDx@q+-t7+55AF6D5xCpLk%Z&rZ+QU8a1F0{ zZA$ZMQfXd2yPI#<4$gDDmr710v@4VeDBe04KUqQ6XF-3kgoLm%7WZ@AkIZ z^Zx0l8vB9|MU{N_^v|n*zZa{wF>E!f()8j)|ArQBRslZJk)O>QPLD??uU-3SQfl6P zbjGWl5djQmYx1_sv)0yGPTjROTaRHn!^Z%IhY+N(pW{w;`LbP~zADd+x>V-6hN=AD z)T>tybnjXJ`*&Y*$n$W$0}mgT=j2^sVCbz9Y7HuXRk$IZ^t1Sf4+m=*sy<~$Go8Ej$IW(Sc2?Ae=O45G{hIYKa{Z(kuk73R z)%<<+aR{qL{S_sXwchOlPRBOZc*uFR6I3**~QhC)Pi8 zoFFR4VE3+;Yt7zS`yQ>B&;I6Y{l^;h4clVYE(lola)ubgS?`9q-p%{_a)WBG6h1%s ztqRE6tF?tAA^tXFkMuqZiG)Iff;XR6^;^BO2|H}OSI$U1c{hvI=WM|P+C5h*zTa4H zcdFv)$s1Dh3gXza_UyCEuKkIUXSu6YXL0%QgUW+5*Jet$&!4}aH6tnP zv-W@8gj?c@e=q!OTEdlPyT6F>M9yLJrWR*L^3iAhPq`(>tUmg$1ZGGEPgg&ebxsLQ E0Eh{$cmMzZ delta 440 zcmdnTevG-kGr-TCmrII^fq{Y7)59eQNFM;=1{P)@xqel31dvh>@Ck7}aNs~fLc;$2 z`)zG)dwP0Yt=a$I6jReQwzQ2l{%`!B!C3r;I8aUB!I>Z}j3q&S!3+-1ZlnP@O;sTg zB`&GO$wiq3C7Jno3=9=>g2M`mO22=ZXfIjMP;|y;hlO#F@nvH#g*lHV9hnrO5Ui=b z(L~=;d8@|CB`%%a#;TiFNN8l8I65@%kcEd@=H?nh+ya0IYl() zZ_EKbW`=++-NSsIs}2J#-tXz+7?RQW_NF6mbAUk0L-%=&*PKL6R<<@Zv9TUy=Hp0U z;Pj|>hzmb>F7Z_BpZlek%x`N4gTi9nik03_}fNbf2;Iz|8EZ4 zJ8k~g#%y@=v-S1ECxr($Jr`fsKKVH7<0n#mfZnn7j7!pJ3W4-&6c6H%e^B?*;>%0-(f&ylZs}xbM_DfP{1sTM- Xu+Z&}#J&AhAQL=Y{an^LB{Ts5ZzQv0 From 888a7ff962d8eb9e5309b7f2a21e04c154483980 Mon Sep 17 00:00:00 2001 From: Aylong Date: Tue, 14 Nov 2023 06:06:46 +0200 Subject: [PATCH 08/14] Update delta.dmm --- _maps/map_files220/delta/delta.dmm | 4064 ++++++++++++++++------------ 1 file changed, 2277 insertions(+), 1787 deletions(-) diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 0a110a2ae65e..a21084f14594 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -788,14 +788,23 @@ icon_state = "red" }, /area/station/security/checkpoint/south) -"age" = ( +"agd" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) +"age" = ( /obj/structure/sign/vacuum{ pixel_x = -32 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "agg" = ( @@ -1073,11 +1082,18 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aik" = ( -/obj/machinery/light/directional/north, -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/structure/window/plasmareinforced{ + dir = 4 + }, +/obj/structure/reflector/single{ + dir = 4; + anchored = 1 + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "ail" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -1119,6 +1135,11 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry) +"aiE" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "aiF" = ( /obj/structure/chair{ dir = 8 @@ -1198,6 +1219,11 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) +"ajf" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "ajy" = ( /obj/item/kirbyplants, /obj/effect/turf_decal/delivery, @@ -2720,6 +2746,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/landmark/damageturf, +/obj/random/hampter, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "arw" = ( @@ -3991,6 +4018,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"avE" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "caution" + }, +/area/station/engineering/controlroom) "avI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4197,6 +4230,17 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"awP" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/station/engineering/controlroom) "awV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4500,38 +4544,40 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axK" = ( +/obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) +"axL" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axM" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axN" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/structure/dispenser, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axO" = ( @@ -4547,24 +4593,27 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/structure/sign/electricshock{ + pixel_y = -32 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + dir = 4; + icon_state = "caution" }, /area/station/engineering/controlroom) "axR" = ( -/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"axS" = ( /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/station/engineering/controlroom) +"axS" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -4584,15 +4633,16 @@ }, /area/station/engineering/controlroom) "axW" = ( -/obj/effect/turf_decal/delivery/hollow, +/obj/item/kirbyplants, +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/table/reinforced, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axY" = ( @@ -4756,14 +4806,14 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ayJ" = ( -/obj/machinery/atmospherics/binary/valve/digital, -/obj/machinery/driver_button/sm_drop_button{ - pixel_y = -14; - pixel_x = 16; - range = 20 +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Gas to Loop" }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "ayK" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/turf_decal/stripes/line{ @@ -4779,14 +4829,9 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "ayO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/stack/cable_coil/random, -/obj/item/stack/cable_coil/random, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/effect/spawner/window/reinforced/plasma/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/engine/supermatter) "ayP" = ( /obj/machinery/status_display{ name = "Дисплей статуса" @@ -4799,6 +4844,15 @@ icon_state = "neutralfull" }, /area/station/engineering/controlroom) +"ayT" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ayV" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -5113,6 +5167,15 @@ }, /turf/simulated/floor/plating, /area/station/engineering/engine/supermatter) +"azU" = ( +/obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "azV" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -5151,10 +5214,10 @@ /area/station/engineering/engine/supermatter) "aAd" = ( /obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 4; + icon_state = "0-4" }, +/obj/machinery/power/rad_collector, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "aAe" = ( @@ -5516,21 +5579,12 @@ /turf/space, /area/space/nearstation) "aBX" = ( -/obj/machinery/camera{ - c_tag = "Supermatter West"; - dir = 4; - network = list("Engineering","SS13"); - pixel_y = -22 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/mass_driver/sm_mass_driver{ + dir = 1 }, -/obj/machinery/atmospherics/portable/canister/toxins, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/supermatter_crystal/engine, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "aBY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance/two, @@ -5551,10 +5605,12 @@ /turf/simulated/floor/plating, /area/station/engineering/controlroom) "aCi" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, /obj/effect/turf_decal/stripes/line{ - dir = 10 + dir = 8 }, -/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aCj" = ( @@ -5726,6 +5782,16 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"aCV" = ( +/obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "aCW" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5762,15 +5828,11 @@ }, /area/station/engineering/controlroom) "aDe" = ( -/obj/machinery/light/directional/east, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 8 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -5783,8 +5845,17 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aDh" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/reflector/box{ +/obj/machinery/light/directional/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -5912,15 +5983,15 @@ /turf/space, /area/station/maintenance/auxsolarport) "aEd" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 2 +/obj/machinery/atmospherics/trinary/filter{ + dir = 1; + filter_type = "n2"; + name = "nitrogen filter"; + on = 1 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aEe" = ( /obj/machinery/light/directional/west, @@ -5986,11 +6057,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/obj/machinery/driver_button/sm_drop_button{ - pixel_y = -14; - pixel_x = 16; - range = 20 - }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -6281,6 +6347,21 @@ icon_state = "neutralfull" }, /area/station/engineering/controlroom) +"aFl" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aFp" = ( /obj/machinery/light/directional/west, /obj/machinery/navbeacon{ @@ -6436,6 +6517,14 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"aGd" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/small/directional/south, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/tank/internals/plasma, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aGe" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -6728,6 +6817,13 @@ }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) +"aHG" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "aHI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -6974,6 +7070,9 @@ /area/station/maintenance/turbine) "aIv" = ( /obj/machinery/atmospherics/unary/tank/toxins, +/obj/structure/sign/nosmoking_2{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIw" = ( @@ -6993,6 +7092,9 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) +"aIy" = ( +/turf/simulated/floor/plasteel/dark, +/area/station/maintenance/turbine) "aIz" = ( /obj/machinery/power/terminal{ dir = 4 @@ -7004,50 +7106,38 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIA" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular{ - pixel_y = 6 +/obj/machinery/power/smes{ + charge = 1e+006 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/structure/sign/electricshock{ + pixel_y = 32 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/maintenance/turbine) "aIB" = ( +/obj/item/kirbyplants, /obj/effect/turf_decal/stripes/line{ - dir = 2 + dir = 10 }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aID" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aIE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/south, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aIF" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/portable/canister/nitrogen, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aIG" = ( @@ -7237,6 +7327,13 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/space, /area/space/nearstation) +"aJD" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aJE" = ( /obj/machinery/conveyor/south{ id = "QMLoad2" @@ -7244,9 +7341,13 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "aJF" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/space/nearstation) +/obj/item/kirbyplants, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aJG" = ( /obj/structure/table/reinforced, /obj/machinery/light/small/directional/south, @@ -7342,12 +7443,14 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aJU" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/sign/nosmoking_2{ + pixel_y = 32 }, -/obj/machinery/atmospherics/meter, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/maintenance/turbine) "aJV" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -7592,9 +7695,7 @@ /area/station/maintenance/auxsolarport) "aKZ" = ( /obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) "aLb" = ( @@ -7685,20 +7786,14 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aLw" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ +/obj/machinery/power/terminal, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/unary/thermomachine/freezer{ - dir = 4 + d2 = 4; + icon_state = "1-4" }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aLx" = ( @@ -7882,9 +7977,15 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) +"aMJ" = ( +/obj/structure/sign/vacuum, +/turf/simulated/wall/r_wall, +/area/station/maintenance/turbine) "aMK" = ( -/turf/space, -/area/station/hallway/secondary/entry) +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/maintenance/turbine) "aML" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -8447,6 +8548,20 @@ icon_state = "neutralfull" }, /area/station/maintenance/turbine) +"aPy" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/obj/item/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/station/engineering/atmos) "aPz" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/storage/hazardvest, @@ -9042,18 +9157,21 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "aSH" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ - dir = 2 + dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/engineering/atmos) "aSI" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -13855,10 +13973,20 @@ }, /area/station/hallway/secondary/bridge) "bnK" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plasteel, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/reflector/box{ + dir = 8 + }, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "bnM" = ( /obj/structure/window/reinforced, @@ -25867,6 +25995,17 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/port) +"che" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "chi" = ( /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -28932,7 +29071,6 @@ /area/station/maintenance/dormitory_maintenance) "cuJ" = ( /obj/docking_port/stationary{ - dir = 8; dwidth = 3; height = 5; id = "sst_home"; @@ -32175,10 +32313,7 @@ }, /area/station/maintenance/dormitory_maintenance) "cJs" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -41702,6 +41837,10 @@ }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) +"dFi" = ( +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "dFm" = ( /turf/simulated/wall/r_wall, /area/station/science/storage) @@ -41852,10 +41991,12 @@ /area/station/maintenance/apmaint) "dFZ" = ( /obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/engineering/controlroom) "dGf" = ( /turf/simulated/floor/plasteel, @@ -44964,6 +45105,18 @@ }, /turf/simulated/floor/plating, /area/station/engineering/control) +"dWj" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "dWk" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -46333,11 +46486,13 @@ }, /area/station/medical/medbay2) "eiU" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/space, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "caution" + }, /area/station/engineering/controlroom) "eiX" = ( /turf/simulated/floor/transparent/glass, @@ -47420,7 +47575,6 @@ }, /area/station/medical/medbay2) "eCj" = ( -/obj/machinery/status_display/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -47491,14 +47645,8 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "eEd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/effect/turf_decal/stripes/line, +/obj/item/radio/intercom/directional/south, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -47556,6 +47704,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/science/research) +"eFV" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "eFX" = ( /obj/structure/chair/sofa/right{ color = "#A30FAF"; @@ -49042,15 +49202,19 @@ /turf/simulated/floor/plating, /area/station/legal/courtroom) "fjw" = ( -/obj/machinery/power/smes{ - charge = 1e+006 - }, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/turf/simulated/floor/plasteel/dark, -/area/station/maintenance/turbine) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/station/engineering/controlroom) "fjF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -49989,6 +50153,15 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"fzx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/station/engineering/controlroom) "fzE" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -50108,9 +50281,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "fCZ" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, /area/station/engineering/controlroom) "fDh" = ( /obj/structure/rack, @@ -51559,17 +51735,21 @@ }, /area/station/hallway/primary/central) "gba" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gbe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -52951,7 +53131,19 @@ }, /area/station/medical/morgue) "gBo" = ( -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/item/kirbyplants, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "gBF" = ( @@ -53374,6 +53566,13 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) +"gJL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel, +/area/station/maintenance/turbine) "gJQ" = ( /turf/simulated/floor/wood, /area/station/command/office/hos) @@ -54133,10 +54332,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "gWk" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/recharge_station, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/reflector/single, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "gWl" = ( /obj/machinery/camera{ c_tag = "Theatre West"; @@ -55429,6 +55632,12 @@ /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "hwu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -55543,11 +55752,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "hxP" = ( @@ -55957,11 +56161,21 @@ }, /area/station/maintenance/apmaint) "hEn" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 + dir = 6 }, -/obj/structure/lattice/catwalk, -/turf/space, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "hEF" = ( /obj/structure/cable{ @@ -56090,12 +56304,13 @@ }, /area/station/security/checkpoint/south) "hGx" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/emitter{ + dir = 1 }, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "hGN" = ( /obj/item/kirbyplants, @@ -57288,7 +57503,7 @@ /area/station/security/permabrig) "hZW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -58321,9 +58536,13 @@ /turf/simulated/floor/plating, /area/station/service/theatre) "iqR" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "Gas to Loop" +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -58794,6 +59013,19 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/aft) +"iyC" = ( +/obj/machinery/atmospherics/trinary/tvalve/digital{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "ize" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -58815,11 +59047,14 @@ }, /area/station/medical/surgery/primary) "izz" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plating, +/area/station/engineering/atmos) "izD" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse/gray, @@ -59981,7 +60216,7 @@ /turf/simulated/wall, /area/station/security/range) "iVF" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -60054,6 +60289,17 @@ icon_state = "yellow" }, /area/station/engineering/break_room) +"iWM" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/reflector/single{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "iWV" = ( /obj/effect/spawner/lootdrop/trash, /obj/structure/sign/poster/official/random/north, @@ -60201,15 +60447,11 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "iZL" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/machinery/economy/vending/wallmed/directional/south, +/obj/effect/turf_decal/stripes/corner, /obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -60614,14 +60856,14 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/warden) "jhz" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/power/emitter{ - anchored = 1; - dir = 1; - state = 2 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/structure/window/plasmareinforced{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "jhD" = ( /obj/machinery/computer/security{ dir = 1 @@ -60636,11 +60878,19 @@ }, /area/station/security/brig) "jhG" = ( -/obj/structure/reflector/box{ +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "jhH" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -60654,14 +60904,8 @@ /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) "jhJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "yellow" - }, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel, +/area/station/maintenance/turbine) "jhM" = ( /obj/structure/table/glass, /obj/item/stack/packageWrap{ @@ -61313,9 +61557,22 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jqX" = ( -/turf/simulated/floor/plasteel{ - icon_state = "yellowcorner" +/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, +/turf/simulated/floor/plating, /area/station/engineering/controlroom) "jqZ" = ( /obj/structure/table/wood, @@ -63339,6 +63596,14 @@ }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) +"kaO" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "kaP" = ( /obj/machinery/light/directional/south, /obj/structure/table/wood, @@ -64189,13 +64454,9 @@ /turf/simulated/wall, /area/station/maintenance/old_kitchen) "kqp" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/trinary/mixer/flipped{ - dir = 8; - name = "Миксер топливной смеси турбины" - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/machinery/light/small/directional/north, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "kqF" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -64217,6 +64478,15 @@ icon_state = "darkblue" }, /area/station/medical/morgue) +"krr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "krw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64350,6 +64620,21 @@ /obj/effect/decal/cleanable/ants, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) +"kur" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "kut" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/directional/north, @@ -64372,6 +64657,18 @@ }, /turf/simulated/floor/plasteel, /area/station/science/research) +"kuJ" = ( +/obj/machinery/atmospherics/unary/thermomachine/freezer{ + dir = 4 + }, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "kuK" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/table/reinforced, @@ -65204,6 +65501,15 @@ "kIP" = ( /turf/simulated/floor/wood/oak, /area/station/maintenance/library) +"kJd" = ( +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/station/engineering/engine/supermatter) "kJV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66034,16 +66340,11 @@ }, /area/station/medical/chemistry) "kXZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 }, -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/analyzer, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "kYh" = ( /obj/structure/table/wood, /obj/item/camera_film, @@ -67041,6 +67342,23 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) +"lqL" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/controlroom) "lrb" = ( /obj/structure/cable{ d1 = 1; @@ -67193,18 +67511,12 @@ }, /area/station/science/toxins/mixing) "ltw" = ( +/obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "yellow" + dir = 4 }, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "ltA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, @@ -68383,11 +68695,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "lNO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + dir = 8; + icon_state = "vault" }, /area/station/engineering/controlroom) "lOk" = ( @@ -68902,12 +69219,24 @@ }, /area/station/medical/virology) "lWo" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/plasteel, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/reflector/box, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "lWq" = ( /obj/structure/closet, @@ -69309,6 +69638,14 @@ icon_state = "hydrofloor" }, /area/station/public/toilet) +"mgh" = ( +/obj/machinery/power/rad_collector, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "mgl" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -70226,23 +70563,13 @@ }, /area/station/security/brig) "mxG" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/binary/valve/digital, +/obj/machinery/driver_button/sm_drop_button{ + range = 20; + pixel_x = 16 }, -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "myf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70910,17 +71237,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "mPO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/firealarm/directional/east, -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) +/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/station/engineering/controlroom) "mPR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71248,6 +71568,13 @@ icon_state = "whitebluecorner" }, /area/station/medical/reception) +"mTu" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "mTw" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/wood/oak, @@ -71535,6 +71862,15 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/research) +"mZv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/controlroom) "mZR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -71816,12 +72152,16 @@ /turf/simulated/floor/carpet, /area/station/medical/psych) "ndW" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA" +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/wall, -/area/station/hallway/secondary/entry) +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/emitter{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "neI" = ( /obj/machinery/door/airlock/medical/glass{ name = "Patients Room" @@ -73744,12 +74084,13 @@ }, /area/station/public/fitness) "nIM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "nJn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -74199,12 +74540,11 @@ }, /area/station/hallway/secondary/exit/maintenance) "nPe" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 +/obj/machinery/atmospherics/trinary/mixer/flipped{ + dir = 8; + name = "Миксер топливной смеси турбины" }, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "nPi" = ( @@ -74321,19 +74661,12 @@ /turf/simulated/floor/plasteel/white, /area/station/security/permabrig) "nRx" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "nRz" = ( @@ -74474,18 +74807,13 @@ }, /area/station/service/janitor) "nUm" = ( -/obj/machinery/camera{ - c_tag = "Supermatter East"; - dir = 8; - network = list("Engineering","SS13") +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "nUp" = ( /obj/effect/turf_decal/delivery, @@ -74537,6 +74865,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) +"nUR" = ( +/obj/effect/turf_decal/arrows{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "nVf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -74827,13 +75161,13 @@ }, /area/station/public/fitness) "oan" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/structure/cable/yellow{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -74983,6 +75317,12 @@ icon_state = "neutral" }, /area/station/security/permabrig) +"ocA" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/delivery/hollow, +/obj/item/clothing/glasses/meson, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ocJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -75079,16 +75419,18 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "oeZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/reflector/box{ - dir = 4 +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellow" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "off" = ( /turf/simulated/floor/plasteel{ @@ -75530,24 +75872,14 @@ /turf/simulated/wall/r_wall, /area/station/medical/storage/secondary) "onA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/door/poddoor{ + id_tag = "SpaceDropSM"; + protected = 0; + name = "SM Drop Door" }, -/area/station/engineering/atmos) +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/station/engineering/controlroom) "onD" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -75760,6 +76092,14 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/dormitory_maintenance) +"oql" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "oqq" = ( /obj/effect/decal/cleanable/dust, /obj/machinery/light/small/directional/east, @@ -76256,12 +76596,12 @@ }, /area/station/hallway/primary/port) "oAP" = ( -/obj/machinery/mass_driver/sm_mass_driver{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/supermatter_crystal/engine, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/obj/machinery/status_display/directional/west, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "oAU" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -76390,8 +76730,11 @@ }, /area/station/science/genetics) "oCV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/hallway/secondary/entry) "oCX" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/wood/oak, @@ -76556,14 +76899,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/machinery/power/rad_collector, /obj/structure/window/plasmareinforced{ dir = 8 }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "oHi" = ( @@ -76728,10 +77066,18 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oKV" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "oLg" = ( /obj/structure/cable{ @@ -78015,9 +78361,9 @@ /area/station/maintenance/fore) "pih" = ( /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) @@ -79022,14 +79368,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/machinery/power/rad_collector, /obj/structure/window/plasmareinforced{ dir = 4 }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "pzB" = ( @@ -79151,21 +79492,13 @@ }, /area/station/security/brig) "pAQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/spawner/window/reinforced/plasma/grilled, /obj/structure/cable{ - d1 = 1; d2 = 2; - icon_state = "1-2" + icon_state = "0-2" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/turf/simulated/floor/plating, +/area/station/engineering/controlroom) "pAT" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -79645,6 +79978,9 @@ }, /turf/simulated/floor/plasteel, /area/station/command/teleporter) +"pJf" = ( +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "pJj" = ( /obj/effect/decal/cleanable/generic, /obj/effect/spawner/random_spawners/cobweb_right_frequent, @@ -79659,15 +79995,13 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "pJw" = ( -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellowcorner" +/obj/machinery/power/rad_collector, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/area/station/engineering/controlroom) +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "pJP" = ( /obj/machinery/light/small/directional/south, /obj/machinery/power/smes, @@ -79922,6 +80256,17 @@ icon_state = "whitepurple" }, /area/station/science/break_room) +"pNz" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/maintenance/turbine) "pOf" = ( /obj/structure/disposalpipe/junction/y{ dir = 4 @@ -79944,13 +80289,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "pOi" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/status_display/directional/west, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "pOp" = ( /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/snacks/disk{ @@ -79980,9 +80326,7 @@ /area/station/supply/office) "pOF" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel{ dir = 4; @@ -80171,17 +80515,18 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "pSJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Supermatter East"; + dir = 8; + network = list("Engineering","SS13") }, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "pSM" = ( @@ -80427,17 +80772,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pYc" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/portable/canister/nitrogen, -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "pYk" = ( /obj/machinery/flasher{ @@ -80685,10 +81025,15 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "qdk" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "qdm" = ( @@ -80700,10 +81045,8 @@ }, /area/station/medical/sleeper) "qdE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "qdW" = ( /obj/structure/barricade/wooden, @@ -80886,9 +81229,14 @@ }, /area/station/security/permabrig) "qhe" = ( -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + icon_state = "neutralfull" }, /area/station/engineering/controlroom) "qhF" = ( @@ -82142,16 +82490,32 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/machinery/power/rad_collector, /obj/structure/window/plasmareinforced{ dir = 8 }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" +/obj/structure/reflector/single{ + dir = 1; + anchored = 1 }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) +"qEN" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reflector/box{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "qEO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -83253,6 +83617,15 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) +"qWG" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "qWV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -83824,17 +84197,16 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "rfT" = ( -/obj/structure/cable/yellow{ +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced/plasma/grilled, -/turf/simulated/floor/plating, -/area/station/engineering/engine/supermatter) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "rgg" = ( /obj/machinery/fishtank/wall, /turf/simulated/wall, @@ -84691,13 +85063,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "rwj" = ( -/obj/machinery/door/poddoor{ - id_tag = "SpaceDropSM"; - protected = 0; - name = "SM Drop Door" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/station/engineering/engine/supermatter) +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "rwn" = ( /obj/effect/spawner/lootdrop/trash, /turf/simulated/floor/plating, @@ -86583,15 +86955,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "sdI" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor{ - id_tag = "SpaceDropSM"; - protected = 0; - name = "SM Drop Door" +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, +/turf/simulated/floor/plasteel/dark, /area/station/engineering/controlroom) "sea" = ( /obj/structure/cable{ @@ -87237,14 +87607,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/obj/machinery/power/rad_collector, /obj/structure/window/plasmareinforced{ dir = 4 }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "sqF" = ( @@ -87716,19 +88081,13 @@ }, /area/station/service/janitor) "syc" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; + name = "KEEP CLEAR: DOCKING AREA" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry) "syi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -88872,6 +89231,20 @@ }, /turf/simulated/floor/carpet, /area/station/service/library) +"sQZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "sRE" = ( /obj/structure/cable{ d1 = 4; @@ -89437,12 +89810,12 @@ /turf/simulated/wall, /area/station/maintenance/virology_maint) "tep" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "teI" = ( @@ -89507,8 +89880,10 @@ }, /area/station/service/kitchen) "tfE" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/economy/vending/coffee, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "tfZ" = ( @@ -90617,12 +90992,10 @@ }, /area/station/medical/surgery/secondary) "tzp" = ( -/obj/machinery/atmospherics/trinary/filter{ - dir = 1; - filter_type = "n2"; - name = "nitrogen filter"; - on = 1 - }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/closet/radiation, +/obj/effect/turf_decal/delivery/hollow, +/obj/item/clothing/glasses/meson, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "tzq" = ( @@ -90758,13 +91131,26 @@ }, /area/station/medical/virology) "tCX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/reflector/box{ + dir = 4 + }, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "tCY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -90802,18 +91188,23 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "tEe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/obj/structure/window/plasmareinforced{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/turf/simulated/floor/plating, +/area/station/engineering/controlroom) "tEi" = ( /turf/simulated/floor/plasteel{ dir = 9; @@ -91531,12 +91922,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "tQK" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/obj/machinery/atmospherics/meter, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/emitter{ + dir = 8 + }, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "tQS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -91699,15 +92093,12 @@ }, /area/station/maintenance/port) "tUw" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "tUS" = ( /obj/structure/table/reinforced, @@ -91999,6 +92390,28 @@ /obj/structure/closet, /turf/simulated/floor/plasteel/dark, /area/station/security/evidence) +"tYw" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/reflector/box{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "tYB" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -92443,6 +92856,14 @@ icon_state = "white" }, /area/station/medical/sleeper) +"ufU" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/camera{ + c_tag = "Supermatter North"; + network = list("SS13","Engineering") + }, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "uge" = ( /obj/structure/cable{ d1 = 4; @@ -92948,12 +93369,13 @@ }, /area/station/maintenance/fore2) "uoQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "uoR" = ( /obj/effect/spawner/window/reinforced/grilled, @@ -93540,14 +93962,22 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) "uBp" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, /area/station/engineering/controlroom) "uBD" = ( /obj/structure/cable{ @@ -93857,6 +94287,15 @@ icon_state = "whitegreencorner" }, /area/station/medical/virology) +"uJs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/controlroom) "uJu" = ( /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /obj/structure/sign/electricshock{ @@ -94128,10 +94567,12 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "uMY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "uNf" = ( /obj/structure/disposalpipe/segment{ @@ -94220,6 +94661,12 @@ icon_state = "darkbluefull" }, /area/station/service/expedition) +"uNZ" = ( +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/maintenance/turbine) "uOa" = ( /obj/item/chair/light, /obj/effect/decal/cleanable/dirt, @@ -94415,9 +94862,19 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/execution) "uQW" = ( -/obj/structure/lattice, -/turf/space, -/area/station/hallway/secondary/entry) +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/analyzer, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "uRf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -94688,6 +95145,24 @@ }, /turf/simulated/floor/engine, /area/station/science/test_chamber) +"uUh" = ( +/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/station/engineering/controlroom) "uUo" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -94967,18 +95442,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "uYk" = ( -/obj/machinery/atmospherics/trinary/tvalve/digital{ - dir = 8 - }, +/obj/machinery/light/small/directional/north, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/emitter, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "uYD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -96847,13 +97318,20 @@ }, /area/station/maintenance/starboard2) "vJN" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/dispenser, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/machinery/economy/atm/east, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/engineering/controlroom) "vJP" = ( /obj/machinery/door/airlock/external{ id_tag = "escape_door_int"; @@ -96902,15 +97380,13 @@ /turf/simulated/floor/grass, /area/station/science/research) "vKK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "vLh" = ( /turf/simulated/floor/plasteel{ @@ -97086,14 +97562,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "vOo" = ( -/obj/machinery/door/poddoor{ - id_tag = "SpaceDropSM"; - protected = 0; - name = "SM Drop Door" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/turf/simulated/floor/plasteel/dark, /area/station/engineering/controlroom) "vOA" = ( /obj/effect/decal/cleanable/dirt, @@ -97477,19 +97952,11 @@ }, /area/station/medical/virology) "vVB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/machinery/light/directional/west, +/obj/machinery/economy/vending/coffee, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "vVF" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -97885,11 +98352,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) "waQ" = ( -/obj/machinery/light/directional/south, -/obj/machinery/status_display/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "waT" = ( @@ -98671,6 +99140,11 @@ "wpW" = ( /turf/simulated/wall, /area/station/maintenance/dormitory_maintenance) +"wqp" = ( +/obj/structure/cable, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/engine, +/area/station/engineering/controlroom) "wqG" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "hos_room" @@ -98965,14 +99439,20 @@ }, /area/station/medical/medbay2) "wwE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/obj/machinery/camera{ + c_tag = "Supermatter West"; + dir = 4; + network = list("Engineering","SS13"); + pixel_y = -22 }, -/obj/item/radio/intercom/directional/south, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/unary/thermomachine/freezer{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -100968,9 +101448,19 @@ /turf/simulated/floor/wood/fancy, /area/station/service/theatre) "xiD" = ( -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/portable/canister/toxins, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "xjh" = ( /obj/machinery/door_control/bolt_control/north{ @@ -117726,7 +118216,7 @@ aaa aaa aaa aaa -aaZ +aaa aaa aaa aaa @@ -118240,19 +118730,19 @@ aaa aaa aaa aaa +aaZ +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa aaa aaa aaa -dij -abj -dij -abj -dij -dij -dij aaa aaa aaa @@ -118499,21 +118989,21 @@ aaa aaa aaa aaa -dij -dij -aGW -dij -dij aaa -abj aaa -abj aaa -dij -dij -abj -dij -dij +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -118756,21 +119246,21 @@ aaa aaa aaa aaa -dij aaa -abj aaa -abj aaa -ash -asV -atY aaa +dij abj -aaa +dij abj -aaa dij +dij +dij +aaa +aaa +aaa +aaa aaa aaa aaa @@ -119014,20 +119504,20 @@ aaa aaa aaa dij +dij +aGW +dij +dij aaa -ash -asV -atY -aaa -ash -ata -atY +abj aaa -ash -asV -atY +abj aaa +dij +dij abj +dij +dij aaa aaa aaa @@ -119270,19 +119760,19 @@ aaa aaa aaa aaa +dij +aaa abj aaa -ash -ata -atY +abj aaa ash -ata +asV atY aaa -ash -ata -atY +abj +aaa +abj aaa dij aaa @@ -119528,101 +120018,20 @@ aaa aaa aaa dij -abj +aaa ash -ata +asV atY -abj +aaa ash ata atY -abj +aaa ash -ata +asV atY -abj -dij -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bUJ -abj -coi -abj -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -cRD -cRD -cRD -xCC -cHA -cXX -cXX -cHA -aaa -aaa -aaa -aaa -aaa -aaa aaa abj -acF aaa aaa aaa @@ -119644,16 +120053,6 @@ aaa aaa aaa aaa -abj -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -119674,6 +120073,11 @@ aaa aaa aaa aaa +bUJ +abj +coi +abj +abj aaa aaa aaa @@ -119692,6 +120096,14 @@ aaa aaa aaa aaa +cRD +cRD +cRD +xCC +cHA +cXX +cXX +cHA aaa aaa aaa @@ -119699,6 +120111,8 @@ aaa aaa aaa aaa +abj +acF aaa aaa aaa @@ -119720,9 +120134,9 @@ aaa aaa aaa aaa -"} -(62,1,1) = {" +abj aaa +abj aaa aaa aaa @@ -119784,21 +120198,10 @@ aaa aaa aaa aaa -dij aaa -ash -ata -atY aaa -ash -ata -atY aaa -ash -ata -atY aaa -abj aaa aaa aaa @@ -119807,6 +120210,8 @@ aaa aaa aaa aaa +"} +(62,1,1) = {" aaa aaa aaa @@ -119838,13 +120243,8 @@ aaa aaa aaa aaa -dij -abj -bUJ aaa -csr aaa -abj aaa aaa aaa @@ -119863,15 +120263,6 @@ aaa aaa aaa aaa -cUP -cUQ -vUu -cIu -elb -drn -drn -cHA -abj aaa aaa aaa @@ -119879,15 +120270,25 @@ aaa aaa aaa aaa -acF aaa aaa aaa aaa +abj aaa +ash +ata +atY aaa +ash +ata +atY aaa +ash +ata +atY aaa +dij aaa aaa aaa @@ -119901,9 +120302,7 @@ aaa aaa aaa aaa -abj aaa -abj aaa aaa aaa @@ -119929,8 +120328,13 @@ aaa aaa aaa aaa +dij +abj +bUJ aaa +csr aaa +abj aaa aaa aaa @@ -119949,6 +120353,15 @@ aaa aaa aaa aaa +cUP +cUQ +vUu +cIu +elb +drn +drn +cHA +abj aaa aaa aaa @@ -119956,6 +120369,7 @@ aaa aaa aaa aaa +acF aaa aaa aaa @@ -119977,9 +120391,9 @@ aaa aaa aaa aaa -"} -(63,1,1) = {" +abj aaa +abj aaa aaa aaa @@ -120038,24 +120452,10 @@ aaa aaa aaa aaa -dij -abj -dij -dij aaa -ash -ata -atY aaa -abj -atb -abj aaa -ash -ata -atY aaa -abj aaa aaa aaa @@ -120067,6 +120467,8 @@ aaa aaa aaa aaa +"} +(63,1,1) = {" aaa aaa aaa @@ -120086,22 +120488,9 @@ aaa aaa aaa aaa -acF -acF -acF -abj -abj -abj -acF -acF -acF -dij aaa -bUJ aaa -csr aaa -abj aaa aaa aaa @@ -120120,24 +120509,8 @@ aaa aaa aaa aaa -cRD -cRD -cRD -xCC -cHA -sPz -cXU -cHA -cHA -cHA -cHA -cHA -cHA aaa aaa -abj -acF -abj aaa aaa aaa @@ -120158,9 +120531,21 @@ aaa aaa aaa aaa +dij abj -aaa +ash +ata +atY abj +ash +ata +atY +abj +ash +ata +atY +abj +dij aaa aaa aaa @@ -120191,9 +120576,22 @@ aaa aaa aaa aaa +acF +acF +acF +abj +abj +abj +acF +acF +acF +dij aaa +bUJ aaa +csr aaa +abj aaa aaa aaa @@ -120212,8 +120610,24 @@ aaa aaa aaa aaa +cRD +cRD +cRD +xCC +cHA +sPz +cXU +cHA +cHA +cHA +cHA +cHA +cHA aaa aaa +abj +acF +abj aaa aaa aaa @@ -120234,14 +120648,9 @@ aaa aaa aaa aaa -"} -(64,1,1) = {" -aaa -aaa -aaa -aaa -aaa +abj aaa +abj aaa aaa aaa @@ -120295,24 +120704,7 @@ aaa aaa aaa aaa -dij aaa -abj -abj -abj -abj -atb -abj -abj -abj -atZ -abj -abj -abj -atb -abj -abj -abj aaa aaa aaa @@ -120332,6 +120724,8 @@ aaa aaa aaa aaa +"} +(64,1,1) = {" aaa aaa aaa @@ -120343,58 +120737,8 @@ aaa aaa aaa aaa -acF -bwN -bwN -bwN -bwN -bwN -bwN -bwN -acF -abj -abj -bUJ -abj -coi -abj -abj aaa -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -dmq -dmq -cHA -cHA -drn -slE -drn -pAC -dpX -cLA -dtU -cHA -cHA aaa -abj -acF -abj aaa aaa aaa @@ -120415,9 +120759,155 @@ aaa aaa aaa aaa -abj aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +dij +aaa +ash +ata +atY +aaa +ash +ata +atY +aaa +ash +ata +atY +aaa +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +acF +bwN +bwN +bwN +bwN +bwN +bwN +bwN +acF +abj +abj +bUJ +abj +coi +abj +abj +aaa +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +dmq +dmq +cHA +cHA +drn +slE +drn +pAC +dpX +cLA +dtU +cHA +cHA +aaa +abj +acF +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aaa +abj aaa aaa aaa @@ -120554,27 +121044,27 @@ aaa aaa dij abj -apF -aEc -aEc -aEc -atc -atZ -atZ -atZ -atZ -atZ -atZ -atZ -atZ -aEb -aEc -aEc -aEc -atc -atZ -atZ -atZ +dij +dij +aaa +ash +ata +atY +aaa +abj +atb +abj +aaa +ash +ata +atY +aaa +abj +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120815,7 +121305,7 @@ abj abj abj abj -atK +atb abj abj abj @@ -120823,15 +121313,15 @@ atZ abj abj abj -atK -abj -abj -abj -abj +atb abj abj abj -atZ +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121067,27 +121557,27 @@ aaa aaa aaa dij -dij abj -abj -aaa -ash -atL -atY -aaa -abj -atK -abj -aaa -ash -atL -atY -aaa -abj -aaa -abj -aaa -aaa +apF +aEc +aEc +aEc +atc +atZ +atZ +atZ +atZ +atZ +atZ +atZ +atZ +aEb +aEc +aEc +aEc +atc +atZ +atZ atZ abj acF @@ -121323,28 +121813,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -dij -aaa -ash -atL -atY -aaa -ash -atL -atY -aaa -ash -atL -atY -aaa dij aaa abj -aaa -aaa +abj +abj +abj +atK +abj +abj +abj +atZ +abj +abj +abj +atK +abj +abj +abj +abj +abj +abj +abj atK abj aLT @@ -121580,25 +122070,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa dij +dij +abj +abj aaa ash atL atY +aaa abj -ash -atL -atY +atK abj +aaa ash atL atY -dKA -dij +aaa abj +aaa abj abj aGX @@ -122097,22 +122587,22 @@ aaa aaa aaa aaa -abj +dij aaa ash -atU +atL atY -aaa +abj ash atL atY -aaa +abj ash -atU +atL atY -aaa +dKA +dij abj -aaa abj aGX aGX @@ -122350,26 +122840,26 @@ aaa aaa aaa aaa -aaZ -aaa aaa aaa -dij aaa -abj aaa -abj +dij aaa ash -atU +atL atY aaa -abj +ash +atL +atY aaa -abj +ash +atL +atY aaa dij -abj +aaa abj aGY aIq @@ -122611,23 +123101,23 @@ aaa aaa aaa aaa -dij -dij -aGW -dij abj aaa -abj +ash +atU +atY aaa -abj +ash +atL +atY +aaa +ash +atU +atY aaa -abj -dij -aGW -dij -dij abj aaa +abj aGY aIr aJI @@ -122864,27 +123354,27 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa +dij aaa +abj aaa +abj aaa +ash +atU +atY aaa -dij -dij -dij -dij -dij -dij -dij -dij -dij abj +aaa abj +aaa +dij abj abj -aaa aGY aIs aJM @@ -123125,23 +123615,23 @@ aaa aaa aaa aaa +dij +dij +aGW +dij +abj aaa -aaa -aaa +abj aaa abj +aaa abj +dij +aGW +dij +dij abj aaa -aAe -aBV -aAe -aBV -aAe -aBV -aAe -aJy -aBV aGY aGY aLr @@ -123385,20 +123875,20 @@ aaa aaa aaa aaa -aaa +dij +dij +dij +dij +dij +dij +dij +dij dij abj abj abj -aAi -ayG -azR -ayG -aAi -ayG -azR -aIT -aEa +abj +aaa leZ aIt aMO @@ -123616,149 +124106,149 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -dij -abj -abj -aaa -aAi -aAi -aAi -aAi -aAi -aAi -aAi -aDC -aBV -aHa -aIu -aJN -ffZ -aLk -aOd -aPt -aQQ -aSz -baa -aOg -wWl -aVR -lOm -aOg -wWl -aVR -lOm -aOg -wWl -aVR -lOm -aOg -lOm -aVR -wWl -aOg -acF -aVc -tls -srs -riQ -bDk -bEO -bIp -qwS -yil -bAF -hVL -unR -erX -eJM -eJn -bXU -bZn -cdb -cxG -aaa -czw -cjI -abj -aaa -acF -acF -acF -acF -acF -aaa -abj -dvU -czw -aaa -cCg -cDw -dUH -bXU -cFT -ddg -cIx -haY -cLF -cMX -cOC -cMX -cJW -cTj -cIx -cWr -cXX -cLz -dbG -yeh -lTi -iFl -yeh -dhw -diY -dkr -dYt -dYu -dYu -dcX -dqZ -xPn -abj -aaa -aaa -abj -aaa -aaa -abj -aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aaa +abj +aaa +aaa +abj +aaa +aaa +aaa +aaa +acF +aHa +aIu +aJN +ffZ +aLk +aOd +aPt +aQQ +aSz +baa +aOg +wWl +aVR +lOm +aOg +wWl +aVR +lOm +aOg +wWl +aVR +lOm +aOg +lOm +aVR +wWl +aOg +acF +aVc +tls +srs +riQ +bDk +bEO +bIp +qwS +yil +bAF +hVL +unR +erX +eJM +eJn +bXU +bZn +cdb +cxG +aaa +czw +cjI +abj +aaa +acF +acF +acF +acF +acF +aaa +abj +dvU +czw +aaa +cCg +cDw +dUH +bXU +cFT +ddg +cIx +haY +cLF +cMX +cOC +cMX +cJW +cTj +cIx +cWr +cXX +cLz +dbG +yeh +lTi +iFl +yeh +dhw +diY +dkr +dYt +dYu +dYu +dcX +dqZ +xPn +abj +aaa +aaa +abj +aaa +aaa +abj +aaa +abj aaa aaa aaa @@ -123900,19 +124390,19 @@ aaa aaa aaa aaa +aaa dij abj abj abj -aAi -ayG -ayG -ayG -aAi -ayG -ayG -aIT -aEa +abj +abj +abj +abj +aaa +abj +abj +abj leZ aIv aJO @@ -124156,19 +124646,19 @@ aaa aaa aaa aaa +aaa abj abj abj -abj -abj -aAi -aDC -aEa -aDC -aEa -aDC -aEa -aDC +aaa +aAe +aBV +aAe +aBV +aAe +aBV +aAe +aJy aBV leZ aIw @@ -124412,21 +124902,21 @@ aaa aaa aaa aaa -abj +aaa +aaa dij abj -atd -atd -eKj -aCd -eKj -eKj -atd -atd -eKj -eKj -eKj -aCd +abj +abj +aAi +ayG +azR +ayG +aAi +ayG +azR +aIT +aEa leZ aIx aJO @@ -124670,28 +125160,28 @@ aaa aaa aaa aaa -abj +aaa dij -atd -avx -axW -ePt -rAC -rAC -aBX -axN -aLw -aLw -rAC -mxG +abj +abj +aaa +aAi +aAi +aAi +aAi +aAi +aAi +aAi +aDC +aBV aHa -aIz -aJR -hgs +aIy +gJL +pNz mPY jmi xqG -kaq +aQT aSA aTW aVD @@ -124927,28 +125417,28 @@ aaa aaa aaa aaa -abj +aaa dij -atd -ayO -aFd -axI -aFd -ltw -oeZ -jhJ -tCX -dFZ -aFd -pSJ -atd -fjw -mPO -hLA +abj +abj +abj +aAi +ayG +ayG +ayG +aAi +ayG +ayG +aIT +aEa +aHa +aIz +aJR +hgs hxO aOb -kqp -brz +aQT +kaq pxC hEc aVE @@ -125186,26 +125676,26 @@ aaa aaa abj abj -atd -kXZ -oCV -aJU -iqR -gBo -aDh -jhz -qdk -tQK -tzp -uYk -aIA +abj +abj +abj +aAi +aDC +aEa +aDC +aEa +aDC +aEa +aDC +aBV leZ -aJS -hgs +aIA +aJR +hLA pih -aOg +izz nPe -aQW +brz aSD ePS aVF @@ -125437,32 +125927,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +dij +dij +abj +dij dij abj atd -tep -oCV -izz -oCV -pJw -jhG -jqX -oCV -qdE -oKV -syc -uMY -leZ -leZ -vHD +atd +eKj +aCd +eKj +eKj +atd +atd +eKj +eKj +eKj +aCd +atd leZ -aOg -aPz -aQT +aJS +hgs +jhJ +aOb +kXZ +aQW aSE gsz aVG @@ -125694,31 +126184,31 @@ aaa aaa aaa aaa +abj aaa +abj aaa -aaa -aaa -dij abj -axl -avI -awI -hGx -hwu -xiD -hwu -xiD -hwu +abj +atd +avx +uQW +ePt +kur +kur +wwE +kuJ +vJN xiD -hwu +rAC gba -aJH -aCi -lZR -aLs -aML +aGd +leZ +aJU +uNZ +aMK aOg -aQZ +aPy aQT wpy bMF @@ -125950,33 +126440,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -raB -aaa -axl -avI -uoQ -uBp -aCp -ayV -aCS -aCS +dij +abj +abj +atd +pAQ +tEe +mPO +atd +aLs +aFd +axI +aFd +ayT +aCi +aCi aDe -aHc -aHc -uly -fhC -aIB -kAG -aLu -aMM -aOj -aUM -nIM +aFd +aFd +sQZ +aJF +leZ +leZ +vHD +aMJ +aOg +aPz +aQT aSD uQB aVF @@ -126207,32 +126697,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -raB -aaa +dij +abj +atd +atd +qWG +tCX +hGx axl avI -hwu +awI axK -ayL -azT -rfT -azT -ayP -aCj -aDf -aFe -aHh +ayJ +azU +ayR +aAg +aCV +aEd +ayR +iyC +aJH aIB -aCk -fCZ -bnK +lZR +aLs +aML aOg -mMM +aQZ aQT aSD oQJ @@ -126464,33 +126954,33 @@ aaa aaa aaa aaa +raB aaa -aaa -aaa -aaa -aaa -dij -aaa -auG -avC -xiD +eKj +ndW +pJf +rwj +pJf +axl +avI +oql axJ -ayM -aAd -aAd -aAd -raH -aCj -aEf -aFf -aHl -waQ -atd -aLp -atd -aOg -aPC -aQT +aCp +ayV +aCS +aCS +aDh +aFl +aHc +uly +fhC +aID +kAG +aLu +aMM +aOj +aUM +aHG aSD qYd aVJ @@ -126721,32 +127211,32 @@ aaa aaa aaa aaa +raB aaa -aaa -aaa -aaa -aaa -dij -abj -atd -aLu +uUh +lWo +nIM +qEN +pJf +axl +avI iVF -axO -ayM -pyQ -tEe -sqD -ksd -ayM -aFg -wBz +axL +ayL +azT +azT +azT +ayP +aCj +aDf +aFe aHh aID -atd -wgY -eMw +aCk +ocA +tzp aOg -noD +mMM aQT aSD qYd @@ -126978,32 +127468,32 @@ aaa aaa aaa aaa +dij aaa -aaa -aaa -aaa -aaa -abj -aaa -vOo -hwu -hwu -axP -rwj -azZ -azZ -azZ -gLW -upc -pcM -aJs +ths +kaO +pJf +uoQ +dFi +auG +avC +fCZ +axM +ayM +mgh +mgh +mgh +raH +aCj +aEf +aFf aHl -aIG -aJV -lSE -xCp -gML -ihk +aIE +atd +aLp +atd +aOg +aPC aQT aSD qYd @@ -127235,35 +127725,35 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +dij abj -aaa +atd +atd +ufU +iWM +pJf sdI +aLu qhe -qhe -axM -rwj -aAa -oAP -aAa -mxm -aAa -aCZ -rZo -aGi -aIH -aJZ -glw -sfh -aOm -aTT -vVB -pAQ -cwX +axO +ayO +pyQ +aik +sqD +ksd +ayM +aFg +wBz +aHh +aIF +atd +wgY +eMw +aOg +noD +aQT +aSD +qYd aVI aOb sHf @@ -127492,32 +127982,32 @@ aaa aaa aaa aaa +dij aaa -aaa -aaa -aaa -aaa -abj -aaa +eKj +pJf +pJf +rwj +pJf vOo -hwu -hwu +avE +eiU axP -rwj -aAb -aAb -aAb -duJ -ayJ +ayM +azZ +azZ +azZ +gLW +upc pcM -gwO -wQE -aEd -lZR -stW -hiq -aOk -aQZ +aJs +aHl +aIG +aJV +lSE +xCp +gML +ihk aQT aSD qYd @@ -127749,35 +128239,35 @@ aaa aaa aaa aaa +raB aaa -aaa -aaa -aaa -aaa -dij -abj -atd -aLs -lNO -axS -ayM -oHg -qEB -qEB -nDt -ayM -ayM -oVs -aHh -wwE -atd -jMo -rbo -aOg -aPG -aQT -aSD onA +nUR +qdE +oKV +pOi +lqL +fjw +lNO +nUm +kJd +aAa +aBX +aAa +mxm +aAa +aCZ +rZo +aGi +aIH +aJZ +glw +sfh +aOm +aTT +jhG +aSH +cwX aVI aXq bbR @@ -128006,32 +128496,32 @@ aaa aaa aaa aaa +dij aaa -aaa -aaa -aaa -aaa -raB -abj -auG -avC -xiD +ths +pJf +pJf +rwj +pJf +uJs +awP +fzx axR ayM -aAd -aAd -aAd -raH -aDc -aEj -aGa -aHl +aAb +aAb +aAb +duJ +mxG +pcM +gwO +wQE iZL -atd -atd -atd -aOg -dVX +lZR +stW +hiq +aOk +aQZ aQT aSD aUe @@ -128229,11 +128719,6 @@ aaa aaa aaa aaa -aaZ -aaa -aaa -aaa -aaa aaa aaa aaa @@ -128269,26 +128754,31 @@ aaa aaa aaa dij -aaa -axl -avI +abj +atd +atd +kqp +gWk +pJf +dFZ +iqR hwu -axK -ayP -aBf -aBf -aBf -ayL -aDc -aEj -aFi -aHm +axS +ayO +oHg +qEB +jhz +nDt +ayM +ayM +oVs +aHh eEd -aJY -aLv -kNF +atd +jMo +rbo aOg -sQf +aPG aQT aSD aTZ @@ -128520,32 +129010,32 @@ aaa aaa aaa aaa +raB aaa -aaa -aaa -aaa -aaa -dij -aaa -axl -avI +eKj +tUw +pJf +rwj +dFi +auG +dWj hZW -nbG -ayI -azV -aCU -aCU -aEe -aFV -aFV -dEE -hox +axN +ayM +aAd +pJw +aAd +raH +aDc +aEj +aGa +aHl oan -oox -aSH -pJP +atd +atd +atd aOg -vRU +dVX aQT aSD aTZ @@ -128777,32 +129267,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa dij -abj +aaa +uBp +lWo +vKK +bnK +pJf axl -aLu +che cJs -axV -ayR -aAg -ayR -aAg -aDd -aEm -aFj -rfH -vKK -aMM -kzE -tUw -oHK +axL +ayP +aBf +aBf +aBf +ayL +aDc +aEj +aFi +aHm +oeZ +aJY +aLv +kNF aOg -aQZ +sQf aQT aSJ aUf @@ -129034,32 +129524,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa dij -abj -atd -atd -aLu -bai -ayK -azW -aCW -aCW -aEl -ygd -exZ -aHp -aMM -gBF -auK -qaS -aes -aOl -aPH +aaa +ths +tQK +pJf +rwj +pJf +axl +che +uMY +nbG +ayI +azV +aCU +aCU +aEe +aFV +aFV +dEE +hox +tep +oox +aLw +pJP +aOg +vRU aQT aSK aUg @@ -129291,33 +129781,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -abj -abj +dij abj -aaa atd atd -lWo -nRx -aIF +uYk +tYw +wqp +axl +che pYc -nUm -fpf -qOQ -vHB -aGc -aJG -atd -atd -atd -atd -aOg +axV +ayR +aAg +ayR +aAg +aDd +aEm +aFj +rfH +mZv +aMM +kzE +nRx +oHK aOg -aIE +aQZ +aQT aSL aUh aPH @@ -129486,39 +129976,26 @@ aaa aaa aaa aaa -"} -(100,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(100,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -129553,26 +130030,39 @@ aaa aaa aaa aaa -abj -fOs aaa aaa -atd -axl -dLX -dLX -atd -aCk -iGI -ths -ths -atd -atd -atd aaa -abj aaa aaa +aaa +aaa +aaa +dij +abj +aaa +atd +pAQ +jqX +mPO +atd +rfT +aCW +bai +ayK +azW +aCW +aCW +aEl +ygd +exZ +aHp +aJD +gBF +auK +qaS +aes +aOl aOg vMy aOg @@ -129806,30 +130296,30 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa abj -aaa -aaa -aaa -aaa -aaa -hEn -hEn -aaa -aaa -eiU -aaa -aaa -aaa -aaa -aaa -aaa +abj +abj +abj abj aaa -aaa +atd +eFV +qdk +axW +hEn +gBo +waQ +pSJ +fpf +qOQ +vHB +aGc +aJG +atd +atd +atd +atd +atd abj inh wRk @@ -130063,26 +130553,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -dij -aaa -aaa -aaa -aaa -aaa -hEn -hEn -aaa -aaa -eiU -aaa -aaa -aaa -aaa -aaa +fOs +fOs +abj +abj +abj +abj +atd +atd +atd +atd +dLX +dLX +atd +aCk +iGI +ths +ths +atd +atd +atd aaa abj biW @@ -130319,7 +130809,7 @@ aaa aaa aaa aaa -aaa +abj abj aaa abj @@ -130576,7 +131066,7 @@ aaa aaa aaa aaa -aaa +abj apG apG apH @@ -130833,7 +131323,7 @@ aaa aaa aaa aaa -aaa +abj apG aqv aro @@ -131090,7 +131580,7 @@ aaa aaa aaa aaa -aaa +abj apG aqw arp @@ -131347,7 +131837,7 @@ aaa aaa aaa aaa -aaa +abj apH aqx arq @@ -131604,7 +132094,7 @@ aaa aaa aaa aaa -aaa +abj apG aqy arr @@ -131834,10 +132324,9 @@ aaa aaa aaa aaa -knM -aaa aaa aaa +knM aaa aaa aaa @@ -131852,9 +132341,9 @@ aaa aaa aaa aaa -nhn aaa aaa +nhn aaa aaa aaa @@ -131862,6 +132351,7 @@ aaa aaa aaa aaa +abj apH aqz ars @@ -132088,13 +132578,13 @@ aaa aaa aaa aaa -aaa +abj +abj +abj acC aef aef acC -uQW -uQW abj abj abj @@ -132107,10 +132597,11 @@ abj abj abj abj -ndW +abj +syc wlY ebA -adb +acC abj abj abj @@ -132118,7 +132609,6 @@ abj abj abj abj -aaa apH aqA art @@ -132344,38 +132834,38 @@ aaa aaa aaa aaa -aaa abj +abj +aaa +aaa acC afb afb acC -aMK -aMK -wXe -rkU -aaa -aaa +abj aaa -wXe -uQW +abj +acC acC acC +adb acC acC acC +abj +aaa +abj acC afb afb acC -aaa +abj aaa aaa aaa aaa aaa abj -aaa apH aqB aru @@ -132599,40 +133089,40 @@ aaa aaa aaa aaa -aaa adb acC adb acC -aef -aef acC -adb -adb -adb acC acC +aef +aef adb acC acC +adb acC -acC -aik +aiE +aiE +vVB nzd -gWk -tfE +ajf +adb +adb +acC acC +adb myI myI acC adb -acC adb adb adb adb adb -aaa +abj apH aqC arv @@ -132854,7 +133344,6 @@ aaa aaa aaa aaa -aaa acC acC acC @@ -132869,27 +133358,28 @@ adZ afJ adZ adZ +agd age -aip -adZ -adZ adZ adZ adZ adZ adZ +krr +tfE adZ +san +oAP adZ -aip adZ -pOi adZ adZ +mTu amL bKz wSO adb -aaa +abj apH aqz arw @@ -133111,7 +133601,6 @@ aaa aaa aaa aaa -aaa nXF pUC rtH @@ -133136,17 +133625,18 @@ cMP uks uks uks +aNH uks -szQ uks uks uks nyB +oCV gQF rUl gEs adb -aaa +abj apG aqD arr @@ -133368,7 +133858,6 @@ aaa aaa aaa aaa -aaa acC acC acC @@ -133383,7 +133872,7 @@ aeb eCj aeb aeb -vJN +ltw agB aeb aeb @@ -133393,17 +133882,18 @@ aeb aeb aeb qQS +ryh aeb -agB aeb -mFy +ltw aeb reW +amB amL ant anP adb -aaa +abj apH aqE ary @@ -133627,7 +134117,6 @@ aaa aaa aaa aaa -aaa adb acC adb @@ -133645,7 +134134,7 @@ acC acC acC acC -aio +ajy aiF aiI ajy @@ -133657,10 +134146,11 @@ adb acC adb adb +adb sgZ qpo adb -aaa +abj apH apH apH @@ -133886,30 +134376,30 @@ aaa aaa aaa aaa -wXe abj -rkU +abj aaa aaa -wXe -rkU aaa +abj aaa aaa -wXe -rkU aaa -wXe -uQW +aaa +abj +aaa +aaa +abj acC acC acC acC acC -aJF -rkU -wXe -rkU +acC +abj +aaa +abj +aaa aaa aaa aaa @@ -134144,7 +134634,7 @@ aaa aaa aaa aaa -wXe +abj abj abj abj From 180167b9f0af960c985702ca98584628c5f7f316 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 21:52:36 +0500 Subject: [PATCH 09/14] Button_Sound_AND_PaperRework --- _maps/map_files220/delta/delta.dmm | 1743 +++++++++-------- .../sm_space_drop/code/paper_sm_info.dm | 5 +- .../sm_space_drop/code/sm_button_NEW.dm | 92 + .../sm_space_drop/icons/sm_buttons.dmi | Bin 958 -> 583 bytes modular_ss220/sm_space_drop/sm_space_drop.dm | 3 - modular_ss220/sm_space_drop/sm_space_drop.dme | 2 +- modular_ss220/sm_space_drop/sound/button.ogg | Bin 0 -> 7048 bytes modular_ss220/sm_space_drop/sound/button1.ogg | Bin 0 -> 5377 bytes modular_ss220/sm_space_drop/sound/button2.ogg | Bin 0 -> 5363 bytes modular_ss220/sm_space_drop/sound/button3.ogg | Bin 0 -> 5381 bytes modular_ss220/sm_space_drop/sound/button4.ogg | Bin 0 -> 5118 bytes 11 files changed, 983 insertions(+), 862 deletions(-) create mode 100644 modular_ss220/sm_space_drop/code/sm_button_NEW.dm create mode 100644 modular_ss220/sm_space_drop/sound/button.ogg create mode 100644 modular_ss220/sm_space_drop/sound/button1.ogg create mode 100644 modular_ss220/sm_space_drop/sound/button2.ogg create mode 100644 modular_ss220/sm_space_drop/sound/button3.ogg create mode 100644 modular_ss220/sm_space_drop/sound/button4.ogg diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index a21084f14594..fc5eaca631a8 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -4633,17 +4633,8 @@ }, /area/station/engineering/controlroom) "axW" = ( -/obj/item/kirbyplants, -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "axY" = ( /obj/structure/grille, @@ -5213,13 +5204,19 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "aAd" = ( -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 }, -/obj/machinery/power/rad_collector, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "aAe" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -6818,12 +6815,22 @@ /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "aHG" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aHI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -7109,9 +7116,6 @@ /obj/machinery/power/smes{ charge = 1e+006 }, -/obj/structure/sign/electricshock{ - pixel_y = 32 - }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -7119,7 +7123,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIB" = ( -/obj/item/kirbyplants, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -7144,11 +7147,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) -"aIH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -7156,6 +7157,15 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"aIH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aIQ" = ( /obj/machinery/economy/vending/janidrobe, /turf/simulated/floor/plasteel{ @@ -7328,12 +7338,19 @@ /turf/space, /area/space/nearstation) "aJD" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/structure/window/plasmareinforced{ + dir = 4 + }, +/obj/machinery/power/rad_collector, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "aJE" = ( /obj/machinery/conveyor/south{ id = "QMLoad2" @@ -7341,12 +7358,17 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "aJF" = ( -/obj/item/kirbyplants, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aJG" = ( /obj/structure/table/reinforced, @@ -7360,14 +7382,22 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aJH" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "aJI" = ( @@ -7443,14 +7473,14 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aJU" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/sign/nosmoking_2{ - pixel_y = 32 +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id_tag = "engsm" }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/engineering/engine/supermatter) "aJV" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -7982,10 +8012,23 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/turbine) "aMK" = ( -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular{ + pixel_y = 2 + }, /turf/simulated/floor/plasteel, -/area/station/maintenance/turbine) +/area/station/engineering/controlroom) "aML" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -9157,21 +9200,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "aSH" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/controlroom) "aSI" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -29477,17 +29512,16 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -45792,9 +45826,9 @@ /turf/simulated/floor/carpet, /area/station/service/chapel/office) "dYV" = ( -/obj/structure/rack, -/obj/item/storage/secure/briefcase, /obj/machinery/newscaster/directional/south, +/obj/structure/table/reinforced, +/obj/item/paper/sm_paper, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "dYX" = ( @@ -47705,17 +47739,24 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "eFV" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; +/obj/machinery/camera{ + c_tag = "Supermatter South"; + network = list("SS13","Engineering") + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/cable/yellow{ + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/alarm/engine{ + pixel_y = 24 }, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/engineering/engine/supermatter) "eFX" = ( /obj/structure/chair/sofa/right{ color = "#A30FAF"; @@ -49064,21 +49105,10 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "fhC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/station/engineering/controlroom) +/obj/structure/rack, +/obj/item/storage/secure/briefcase, +/turf/simulated/floor/plasteel/dark, +/area/station/command/office/ce) "fhF" = ( /turf/space, /area/shuttle/gamma/station) @@ -52920,11 +52950,9 @@ }, /area/station/security/prison/cell_block/A) "gwO" = ( -/obj/machinery/camera{ - c_tag = "Supermatter South"; - network = list("SS13","Engineering") +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/visible, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52933,8 +52961,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/alarm/engine{ - pixel_y = 24 +/obj/machinery/power/apc/super/north, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/cable/yellow{ d1 = 2; @@ -53130,22 +53165,6 @@ icon_state = "darkblue" }, /area/station/medical/morgue) -"gBo" = ( -/obj/item/kirbyplants, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "gBF" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/welding/flamedecal/blue{ @@ -58722,6 +58741,14 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) +"itK" = ( +/obj/machinery/atmospherics/binary/valve/digital, +/obj/machinery/driver_button/sm_drop_button{ + pixel_x = 32; + range = 20 + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "itL" = ( /obj/structure/cable{ d1 = 4; @@ -60447,12 +60474,12 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "iZL" = ( -/obj/effect/turf_decal/stripes/corner, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "iZR" = ( @@ -60856,12 +60883,17 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/warden) "jhz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, /obj/structure/window/plasmareinforced{ dir = 8 }, +/obj/machinery/power/rad_collector, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "jhD" = ( @@ -60878,19 +60910,10 @@ }, /area/station/security/brig) "jhG" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "jhH" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -64621,18 +64644,17 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "kur" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/delivery/hollow, +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/table/reinforced, +/obj/item/rpd, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "kut" = ( @@ -69639,6 +69661,12 @@ }, /area/station/public/toilet) "mgh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/structure/window/plasmareinforced{ + dir = 4 + }, /obj/machinery/power/rad_collector, /obj/structure/cable/yellow{ d2 = 8; @@ -70563,13 +70591,25 @@ }, /area/station/security/brig) "mxG" = ( -/obj/machinery/atmospherics/binary/valve/digital, -/obj/machinery/driver_button/sm_drop_button{ - range = 20; - pixel_x = 16 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/atmos) "myf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71863,14 +71903,21 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "mZv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, -/obj/effect/turf_decal/stripes/corner, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "mZR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -74866,10 +74913,11 @@ /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "nUR" = ( -/obj/effect/turf_decal/arrows{ - dir = 1 +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/turf/simulated/floor/engine, +/turf/space, /area/station/engineering/controlroom) "nVf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -75169,6 +75217,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "oav" = ( @@ -75318,11 +75371,12 @@ }, /area/station/security/permabrig) "ocA" = ( -/obj/structure/closet/radiation, -/obj/effect/turf_decal/delivery/hollow, -/obj/item/clothing/glasses/meson, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "ocJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -75418,20 +75472,6 @@ }, /turf/simulated/floor/plating, /area/station/science/robotics/showroom) -"oeZ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "off" = ( /turf/simulated/floor/plasteel{ icon_state = "red" @@ -76896,11 +76936,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "oHg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/obj/structure/window/plasmareinforced{ - dir = 8 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) @@ -77562,24 +77601,15 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "oVs" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/power/apc/super/north, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, -/area/station/engineering/engine/supermatter) +/area/station/engineering/controlroom) "oVE" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -79364,15 +79394,6 @@ /obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/maintenance/incinerator) -"pyQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) "pzB" = ( /obj/machinery/firealarm/directional/north{ pixel_x = 5 @@ -79995,12 +80016,13 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "pJw" = ( -/obj/machinery/power/rad_collector, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id_tag = "engsm" }, -/turf/simulated/floor/engine, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/station/engineering/engine/supermatter) "pJP" = ( /obj/machinery/light/small/directional/south, @@ -80515,17 +80537,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "pSJ" = ( -/obj/machinery/camera{ - c_tag = "Supermatter East"; - dir = 8; - network = list("Engineering","SS13") - }, +/obj/effect/turf_decal/delivery/hollow, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -81025,15 +81042,9 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "qdk" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "qdm" = ( @@ -87604,14 +87615,20 @@ }, /area/station/service/kitchen) "sqD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/window/plasmareinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "sqF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -90992,12 +91009,19 @@ }, /area/station/medical/surgery/secondary) "tzp" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/delivery/hollow, -/obj/item/clothing/glasses/meson, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/structure/window/plasmareinforced{ + dir = 8 + }, +/obj/machinery/power/rad_collector, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "tzq" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -94662,11 +94686,14 @@ }, /area/station/service/expedition) "uNZ" = ( -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/station/maintenance/turbine) +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "uOa" = ( /obj/item/chair/light, /obj/effect/decal/cleanable/dirt, @@ -98352,13 +98379,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) "waQ" = ( +/obj/machinery/camera{ + c_tag = "Supermatter East"; + dir = 8; + network = list("Engineering","SS13") + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "waT" = ( @@ -100367,7 +100398,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + icon_state = "neutralfull" }, /area/station/engineering/controlroom) "wQG" = ( @@ -123876,19 +123907,19 @@ aaa aaa aaa dij -dij -dij -dij -dij -dij -dij -dij -dij -abj +aaa +aaa abj +aaa abj +aaa +aaa abj aaa +aaa +aaa +aaa +acF leZ aIt aMO @@ -124134,18 +124165,18 @@ aaa aaa aaa aaa -aaa +dij +abj +abj +abj +abj abj -aaa abj -aaa -aaa abj aaa -aaa -aaa -aaa -acF +abj +abj +abj aHa aIu aJN @@ -124390,19 +124421,19 @@ aaa aaa aaa aaa -aaa -dij -abj -abj -abj -abj abj abj abj aaa -abj -abj -abj +aAe +aBV +aAe +aBV +aAe +aBV +aAe +aJy +aBV leZ aIv aJO @@ -124647,19 +124678,19 @@ aaa aaa aaa aaa +dij abj abj abj -aaa -aAe -aBV -aAe -aBV -aAe -aBV -aAe -aJy -aBV +aAi +ayG +azR +ayG +aAi +ayG +azR +aIT +aEa leZ aIw aJO @@ -124907,16 +124938,16 @@ aaa dij abj abj -abj +aaa aAi -ayG -azR -ayG aAi -ayG -azR -aIT -aEa +aAi +aAi +aAi +aAi +aAi +aDC +aBV leZ aIx aJO @@ -125164,16 +125195,16 @@ aaa dij abj abj -aaa -aAi -aAi -aAi -aAi -aAi +abj aAi +ayG +ayG +ayG aAi -aDC -aBV +ayG +ayG +aIT +aEa aHa aIy gJL @@ -125181,7 +125212,7 @@ pNz mPY jmi xqG -aQT +kaq aSA aTW aVD @@ -125418,27 +125449,27 @@ aaa aaa aaa aaa -dij +abj abj abj abj aAi -ayG -ayG -ayG -aAi -ayG -ayG -aIT +aDC +aEa +aDC +aEa +aDC aEa +aDC +aBV aHa aIz aJR hgs hxO aOb -aQT -kaq +nPe +brz pxC hEc aVE @@ -125642,155 +125673,155 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abj -abj -abj -abj -abj -aAi -aDC -aEa -aDC -aEa -aDC -aEa -aDC -aBV -leZ -aIA -aJR -hLA -pih -izz -nPe -brz -aSD -ePS -aVF -aXj -aYz -bus -eUk -eUk -eUk -ban -aXW -aYt -bkA -bmw -bnU -bpB -brC -bti -buq -bvG -bwP -fBT -bzN -ebH -fGU -bES -bGz -bIu -bKg -bMk -bOd -bMk -bRY -bUk -bWn -bXU -bZp -hLU -bXU -bXU -cgG -cgG -cgG -cgG -cmQ -yar -onQ -yar -csp -cgG -cgG -cgG -cgG -bXU -bXU -uVM -cDz -bXU -qMB -dWg -cHi -rMm -vKs -tmx -cOE -iZl -cRJ -cOG -cUS -fvA -drn -irt -yeh -rJi -dcT -mAs -yeh -yeh -yeh -dcX -dfN -sph -dYu -dYz -drc -yeh -dlK -dbz -aaa -acF -abj -abj -acF -aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +dij +dij +abj +dij +dij +abj +atd +atd +eKj +aCd +eKj +eKj +atd +atd +eKj +eKj +eKj +aCd +atd +aIA +aJR +hLA +pih +izz +kXZ +aQW +aSD +ePS +aVF +aXj +aYz +bus +eUk +eUk +eUk +ban +aXW +aYt +bkA +bmw +bnU +bpB +brC +bti +buq +bvG +bwP +fBT +bzN +ebH +fGU +bES +bGz +bIu +bKg +bMk +bOd +bMk +bRY +bUk +bWn +bXU +bZp +hLU +bXU +bXU +cgG +cgG +cgG +cgG +cmQ +yar +onQ +yar +csp +cgG +cgG +cgG +cgG +bXU +bXU +uVM +cDz +bXU +qMB +dWg +cHi +rMm +vKs +tmx +cOE +iZl +cRJ +cOG +cUS +fvA +drn +irt +yeh +rJi +dcT +mAs +yeh +yeh +yeh +dcX +dfN +sph +dYu +dYz +drc +yeh +dlK +dbz +aaa +acF +abj +abj +acF +aaa +abj aaa aaa aaa @@ -125927,32 +125958,32 @@ aaa aaa aaa aaa -dij -dij abj -dij -dij +aaa +abj +aaa +abj abj atd -atd -eKj -aCd -eKj -eKj -atd -atd -eKj -eKj -eKj -aCd -atd +avx +uQW +ePt +aMK +aHG +wwE +kuJ +vJN +xiD +rAC +gba +aGd leZ aJS hgs jhJ -aOb -kXZ -aQW +aOg +aPy +aQT aSE gsz aVG @@ -125987,7 +126018,7 @@ bOe bUl bRZ bUl -bIq +fhC bXU fEo cbi @@ -126183,32 +126214,32 @@ aaa aaa aaa aaa -aaa -abj -aaa -abj -aaa +dij abj abj atd -avx -uQW -ePt -kur -kur -wwE -kuJ -vJN -xiD -rAC -gba -aGd +pAQ +tEe +mPO +atd +aIH +aFd +axI +aFd +ayT +aCi +aCi +aDe +aFd +aFd +sQZ +aIB leZ -aJU -uNZ -aMK +leZ +vHD +aMJ aOg -aPy +aPz aQT wpy bMF @@ -126442,30 +126473,30 @@ aaa aaa dij abj -abj atd -pAQ -tEe -mPO atd -aLs -aFd -axI -aFd -ayT -aCi -aCi -aDe -aFd -aFd -sQZ +qWG +tCX +hGx +axl +avI +awI +axK +ayJ +azU +ayR +aAg +aCV +aEd +ayR +iyC aJF leZ -leZ -vHD -aMJ +lZR +aLs +aML aOg -aPz +aQZ aQT aSD uQB @@ -126697,33 +126728,33 @@ aaa aaa aaa aaa -dij -abj -atd -atd -qWG -tCX -hGx +raB +aaa +eKj +ndW +pJf +rwj +pJf axl avI -awI -axK -ayJ -azU -ayR -aAg -aCV -aEd -ayR -iyC +oql +axJ +aCp +ayV +aHc +aCS +aDh +aFl +aHc +uly aJH aIB -lZR -aLs -aML -aOg -aQZ -aQT +kAG +aLu +aMM +aOj +aUM +ocA aSD oQJ aVI @@ -126956,31 +126987,31 @@ aaa aaa raB aaa -eKj -ndW -pJf -rwj +uUh +lWo +nIM +qEN pJf axl avI -oql -axJ -aCp -ayV -aCS -aCS -aDh -aFl -aHc -uly -fhC +iVF +axL +ayL +azT +aJU +azT +ayP +aCj +aDf +aFe +aHh aID -kAG -aLu -aMM -aOj -aUM -aHG +aCk +jhG +qdk +aOg +mMM +aQT aSD qYd aVJ @@ -127211,32 +127242,32 @@ aaa aaa aaa aaa -raB +dij aaa -uUh -lWo -nIM -qEN +ths +kaO pJf -axl -avI -iVF -axL -ayL -azT -azT -azT -ayP +uoQ +dFi +auG +avC +fCZ +axM +ayM +oHg +aAa +oHg +raH aCj -aDf -aFe -aHh +aEf +aFf +aHl aID -aCk -ocA -tzp +atd +aLp +atd aOg -mMM +aPC aQT aSD qYd @@ -127469,31 +127500,31 @@ aaa aaa aaa dij -aaa -ths -kaO +abj +atd +atd +ufU +iWM pJf -uoQ -dFi -auG -avC -fCZ -axM -ayM -mgh -mgh +sdI +aLu +qhe +axO +ayO +aJD +aik mgh -raH -aCj -aEf -aFf -aHl +ksd +ayM +aFg +wBz +aHh aIE atd -aLp -atd +wgY +eMw aOg -aPC +noD aQT aSD qYd @@ -127726,31 +127757,31 @@ aaa aaa aaa dij -abj -atd -atd -ufU -iWM +aaa +eKj pJf -sdI -aLu -qhe -axO -ayO -pyQ -aik -sqD -ksd +pJf +rwj +pJf +vOo +avE +eiU +axP ayM -aFg -wBz -aHh +azZ +azZ +azZ +gLW +upc +pcM +aJs +aHl aIF -atd -wgY -eMw -aOg -noD +aJV +lSE +xCp +gML +ihk aQT aSD qYd @@ -127982,35 +128013,35 @@ aaa aaa aaa aaa -dij +raB aaa -eKj -pJf -pJf -rwj -pJf -vOo -avE -eiU -axP -ayM -azZ -azZ -azZ -gLW -upc -pcM -aJs -aHl +onA +axW +qdE +oKV +pOi +lqL +fjw +lNO +nUm +kJd +aAa +aBX +aAa +mxm +aAa +aCZ +rZo +aGi aIG -aJV -lSE -xCp -gML -ihk -aQT -aSD -qYd +aJZ +glw +sfh +aOm +aTT +aAd +mZv +mxG aVL aXo aXo @@ -128239,34 +128270,34 @@ aaa aaa aaa aaa -raB +dij aaa -onA -nUR -qdE -oKV -pOi -lqL -fjw -lNO -nUm -kJd -aAa -aBX -aAa -mxm -aAa -aCZ -rZo -aGi -aIH -aJZ -glw -sfh -aOm -aTT -jhG -aSH +ths +pJf +pJf +rwj +pJf +uJs +awP +fzx +axR +ayM +aAb +aAb +aAb +duJ +itK +pcM +eFV +aHl +aID +lZR +stW +hiq +aOk +aQZ +aQT +aSD cwX aVI aXq @@ -128497,31 +128528,31 @@ aaa aaa aaa dij -aaa -ths -pJf -pJf -rwj +abj +atd +atd +kqp +gWk pJf -uJs -awP -fzx -axR +dFZ +iqR +hwu +axS +ayO +jhz +qEB +tzp +nDt +ayM ayM -aAb -aAb -aAb -duJ -mxG -pcM gwO wQE iZL -lZR -stW -hiq -aOk -aQZ +atd +jMo +rbo +aOg +aPG aQT aSD aUe @@ -128753,32 +128784,32 @@ aaa aaa aaa aaa -dij -abj -atd -atd -kqp -gWk +raB +aaa +eKj +tUw pJf -dFZ -iqR -hwu -axS -ayO -oHg -qEB -jhz -nDt -ayM +rwj +dFi +auG +dWj +hZW +axN ayM -oVs -aHh +oHg +aAa +oHg +raH +aDc +aEj +aGa +aHl eEd atd -jMo -rbo +atd +atd aOg -aPG +dVX aQT aSD aTZ @@ -129010,32 +129041,32 @@ aaa aaa aaa aaa -raB +dij aaa -eKj -tUw +uBp +lWo +vKK +bnK pJf -rwj -dFi -auG -dWj -hZW -axN -ayM -aAd +axl +che +cJs +axL +ayP +aBf pJw -aAd -raH +aBf +ayL aDc aEj -aGa -aHl +aFi +aHm oan -atd -atd -atd +aJY +aLv +kNF aOg -dVX +sQf aQT aSD aTZ @@ -129269,30 +129300,30 @@ aaa aaa dij aaa -uBp -lWo -vKK -bnK +ths +tQK +pJf +rwj pJf axl che -cJs -axL -ayP -aBf -aBf -aBf -ayL -aDc -aEj -aFi -aHm -oeZ -aJY -aLv -kNF +uMY +nbG +ayI +azV +aFV +aCU +aEe +aFV +aFV +dEE +hox +tep +oox +aLw +pJP aOg -sQf +vRU aQT aSJ aUf @@ -129525,31 +129556,31 @@ aaa aaa aaa dij -aaa -ths -tQK -pJf -rwj -pJf +abj +atd +atd +uYk +tYw +wqp axl che -uMY -nbG -ayI -azV -aCU -aCU -aEe -aFV -aFV -dEE -hox -tep -oox -aLw -pJP +pYc +axV +ayR +aAg +ayR +aAg +aDd +aEm +aFj +rfH +aSH +aID +kzE +nRx +oHK aOg -vRU +aQZ aQT aSK aUg @@ -129783,30 +129814,30 @@ aaa aaa dij abj +aaa atd +pAQ +jqX +mPO atd -uYk -tYw -wqp -axl -che -pYc -axV -ayR -aAg -ayR -aAg -aDd -aEm -aFj -rfH -mZv +rfT +aCW +bai +ayK +azW +aCW +aCW +aEl +ygd +exZ +aHp +aCW aMM -kzE -nRx -oHK -aOg -aQZ +auK +qaS +aes +aOl +aPH aQT aSL aUh @@ -130038,31 +130069,31 @@ aaa aaa aaa aaa -dij +aaa +abj +abj +abj +abj abj aaa atd -pAQ -jqX -mPO -atd -rfT -aCW -bai -ayK -azW -aCW -aCW -aEl -ygd -exZ -aHp -aJD +pSJ +oVs +kur +hEn +sqD +uNZ +waQ +fpf +qOQ +vHB +aGc +aJG gBF -auK -qaS -aes -aOl +atd +atd +atd +aOg aOg vMy aOg @@ -130296,30 +130327,30 @@ aaa aaa aaa aaa +fOs +fOs abj abj abj abj -abj -aaa atd -eFV -qdk -axW -hEn -gBo -waQ -pSJ -fpf -qOQ -vHB -aGc -aJG atd atd atd +dLX +dLX +atd +aCk +iGI +ths +ths +atd +atd atd atd +aaa +aaa +aaa abj inh wRk @@ -130553,26 +130584,26 @@ aaa aaa aaa aaa -fOs -fOs -abj -abj -abj -abj -atd -atd -atd -atd -dLX -dLX -atd -aCk -iGI -ths -ths -atd -atd -atd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +nUR +nUR +aaa +aaa +aOW +aaa +aaa +aaa +aaa +aaa aaa abj biW diff --git a/modular_ss220/sm_space_drop/code/paper_sm_info.dm b/modular_ss220/sm_space_drop/code/paper_sm_info.dm index 224ea2208777..360b8f233459 100644 --- a/modular_ss220/sm_space_drop/code/paper_sm_info.dm +++ b/modular_ss220/sm_space_drop/code/paper_sm_info.dm @@ -4,8 +4,7 @@ name = "\improper инструкция по использованию СБСКС" icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper" - info = {"
Инструкция по использованию Системы Быстрого Сброса Кристала Суперматерии
- + info = {"

Инструкция по использованию Системы Быстрого Сброса Кристала Суперматерии


1. Ни при каких обстоятельствах не нажимать на кнопку ради проверки ее работоспособности.

2. Решение о сбросе кристала может принимать СЕ или его ВРиО и выше.
@@ -19,4 +18,6 @@
Поздравляю! Теперь в случае вероятности взрыва кристала супер материи вы в состоянии сохранить целостность станции.

ПРИМЕЧАНИЕ Кнопка сброса СМ находится в его буферной зоне на стене возле правого вента.
+
+

"} diff --git a/modular_ss220/sm_space_drop/code/sm_button_NEW.dm b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm new file mode 100644 index 000000000000..dc0284f3523f --- /dev/null +++ b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm @@ -0,0 +1,92 @@ + +////////////////////////////////////// +// СБССМ Кнопки // +////////////////////////////////////// + +/obj/machinery/driver_button/sm_drop_button + name = "\improper экстренный сброс СМ" + desc = "ВНИМАНИЕ:Сброс кристала суперматерии. Неправомерное использование может привести к тюремному заключению." + icon = 'modular_ss220/sm_space_drop/icons/sm_buttons.dmi' + icon_state = "button" + anchored = TRUE + armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, rad = 100, fire = 90, acid = 70) + idle_power_consumption = 2 + active_power_consumption = 4 + resistance_flags = LAVA_PROOF | FIRE_PROOF + id_tag = "SpaceDropSM" + req_access = list(ACCESS_CE) + + var/glass = TRUE + var/launched = FALSE + +// In case we're annihilated by a meteor +/obj/machinery/driver_button/sm_drop_button/Destroy() + if(!launched) + launch_sequence() + return ..() + + +/obj/machinery/driver_button/sm_drop_button/update_icon() + if(launched) + icon_state = "[initial(icon_state)]_launched" + else if(!glass) + icon_state = "[initial(icon_state)]_open" + else + icon_state = "[initial(icon_state)]" + ..() + +/obj/machinery/driver_button/sm_drop_button/attack_hand(mob/user) + if(stat & (NOPOWER|BROKEN)) + return + + if(active) + return + + add_fingerprint(user) + + if(!allowed(usr)) + return + + use_power(5) + + // Already launched + if(launched) + to_chat(user, "Кнопку уже нажали, процесс выброса СМ запущен.") + + // Glass present + else if(glass) + if(user.a_intent == INTENT_HARM) + user.custom_emote(EMOTE_VISIBLE, "Разбивает стекло кнопки [src]!") + glass = FALSE + playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) + update_icon() + else + user.custom_emote(EMOTE_VISIBLE, "Хлопает по стеклу кнопки [src].") + to_chat(user, "Если вы пытаетесь разбить стекло, вам придется ударить по нему сильнее...") + // Must be !glass and !launched + else + user.custom_emote(EMOTE_VISIBLE, "Нажиамает кнопку сброса [src]!") + visible_message("Кнопка громко щелкает.") + launch_sequence() + playsound(src, pick('modular_ss220/sm_space_drop/sound/button.ogg','modular_ss220/sm_space_drop/sound/button1.ogg','modular_ss220/sm_space_drop/sound/button2.ogg','modular_ss220/sm_space_drop/sound/button3.ogg','modular_ss220/sm_space_drop/sound/button4.ogg'), 100, 1) + update_icon() + + +/obj/machinery/driver_button/sm_drop_button/launch_sequence() + if(launched) + return + launched = TRUE + update_icon() + + for(var/obj/machinery/atmospherics/supermatter_crystal/engine/crystal in SSair.atmos_machinery) + if(crystal.id_tag == id_tag) + crystal.anchored = FALSE + break + + ..() + +/obj/machinery/driver_button/sm_drop_button/rearm() + active = FALSE + +/obj/machinery/driver_button/drop_sm/multitool_act(mob/user, obj/item/I) + return FALSE diff --git a/modular_ss220/sm_space_drop/icons/sm_buttons.dmi b/modular_ss220/sm_space_drop/icons/sm_buttons.dmi index a01b22adffc989bdbda9cf859d6a75e081c21887..c8628e4e96c61c63f018ec52217b6680ff90ed06 100644 GIT binary patch delta 552 zcmV+@0@wY%2gd||iBL{Q4GJ0x0000DNk~Le0000$0000$2m=5B0G+pi>;M1&IZ#Yg zMe6kZmYbY?f`J|$9>>5gI5;?qmXvueF192jUt?ozY;0$7a3?1xU}|XU^!=!jki(6O zgl%h}X=m-Gjky2-00DGTPE!Ct=GbNc004e^R9JLGWpiVZEh~Qja*U0*I5Sc+(=$pS zoZ^zil2jm5DXFxiBtI`czaTYFiHkEOv#1y-YRJWzR+N~V3SpzG%}FfHOU_75AyPdq zWy%V!elB1)0|46}HqR{MLi+#!0WwKMK~z|U?Umhb!yp(#`3oz7D9PUcVP{q{MXiaI z?v|ro)#&u|G|7L)38;JYJFB*!m6Q0gD4-~uARcP-C}-0a_&{|bHnorJ~dcg zPdxvxvI>`ZJ@Nd6Rk+Medf{$97z_q~$o*Hy{nrAq|5Bj#Utdu7Klb-u3$Xuj1(EN+ z6x97+*KLD=?!UgE3O2BQR^fL%_iwQC@st7#X5L}gAza00002f^@*0ZuGYCT=Yuzd8eBAf@JQ#pkLJk$AjkOOqca|7ea>q%7Ib+F zc?XH+h)yXI^8P%@IH-G)m)DdX7Qsf{T|iNuofen7go=X|b9lCPp0v2CrM=_VPK_Nu zs)`sHV*Y5}jI~d?#lXPy*VDx@q+-t7+55AF6D5xCpLk%Z&rZ+QU8a1F0{ zZA$ZMQfXd2yPI#<4$gDDmr710v@4VeDBe04KUqQ6XF-3kgoLm%7WZ@AkIZ z^Zx0l8vB9|MU{N_^v|n*zZa{wF>E!f()8j)|ArQBRslZJk)O>QPLD??uU-3SQfl6P zbjGWl5djQmYx1_sv)0yGPTjROTaRHn!^Z%IhY+N(pW{w;`LbP~zADd+x>V-6hN=AD z)T>tybnjXJ`*&Y*$n$W$0}mgT=j2^sVCbz9Y7HuXRk$IZ^t1Sf4+m=*sy<~$Go8Ej$IW(Sc2?Ae=O45G{hIYKa{Z(kuk73R z)%<<+aR{qL{S_sXwchOlPRBOZc*uFR6I3**~QhC)Pi8 zoFFR4VE3+;Yt7zS`yQ>B&;I6Y{l^;h4clVYE(lola)ubgS?`9q-p%{_a)WBG6h1%s ztqRE6tF?tAA^tXFkMuqZiG)Iff;XR6^;^BO2|H}OSI$U1c{hvI=WM|P+C5h*zTa4H zcdFv)$s1Dh3gXza_UyCEuKkIUXSu6YXL0%QgUW+5*Jet$&!4}aH6tnP zv-W@8gj?c@e=q!OTEdlPyT6F>M9yLJrWR*L^3iAhPq`(>tUmg$1ZGGEPgg&ebxsLQ E0Eh{$cmMzZ diff --git a/modular_ss220/sm_space_drop/sm_space_drop.dm b/modular_ss220/sm_space_drop/sm_space_drop.dm index 0453f21fcca4..45c1055083c6 100644 --- a/modular_ss220/sm_space_drop/sm_space_drop.dm +++ b/modular_ss220/sm_space_drop/sm_space_drop.dm @@ -1,7 +1,4 @@ /datum/modpack/sm_space_drop - name = "Система сброса СМ" - desc = "Позволяет сбросить СМ в критической ситуации." - author = "GREG" diff --git a/modular_ss220/sm_space_drop/sm_space_drop.dme b/modular_ss220/sm_space_drop/sm_space_drop.dme index bd1b3e1ac98f..57173c811a82 100644 --- a/modular_ss220/sm_space_drop/sm_space_drop.dme +++ b/modular_ss220/sm_space_drop/sm_space_drop.dme @@ -1,6 +1,6 @@ #include "sm_space_drop.dm" -#include "code/sm_button.dm" +#include "code/sm_button_NEW.dm" #include "code/sm_space_drop.dm" #include "code/sm_mass_driver.dm" #include "code/paper_sm_info.dm" diff --git a/modular_ss220/sm_space_drop/sound/button.ogg b/modular_ss220/sm_space_drop/sound/button.ogg new file mode 100644 index 0000000000000000000000000000000000000000..79b458317acff08550309eb150771fd618534096 GIT binary patch literal 7048 zcmai22V9d$(|;lXLN)Y&5kiR)dgwvC0~CSK1EI=^^w6Ypo}wrL5dkR?k)ojl2oMCM z2%d@}MS78L;ZTYKq9^wDZGw02eed`E-uL-!_P5W@?##~2f99EuePEyyv<>?4*copP z?9i7tV6w2dBT+t-X!aCrf9;PY@i5NdI?SHE^Y4eflTFzr@cAop&-efJ+~?Y2qzdS6 zl!zb=`=~%nD8b zcpFSt;z$-5f{+m8t%MWK4Y0y7XeG)=^J$jsQJ2=)eA?MAly5q|`>zh8>n8z0a41ok zFSBgPDtL$xh}xYQMJG_~3@b6bX^!&*zPoRC`G!|CRfL2O;jjoHcWwyS#l%uRS)9b~ zd{X68P@p@5j_Q@KEQ;b+siL3e*Y3q6*=Rp6&$TmpUR9Q9^g_95#7scFX^d!tpK$T5 zyUF8qJbH+*T=b*k*z8kr75Pzs)s|WqC=sX$S!9b_HHh~&pa(~l z?Eh4A6w@2kF?VvdC4(o{%Qen_DlT>^F2OxN+4FjW`}Jhc>140>$%j!XKiY?cC-2#f zqdEo#(G>}KPjRIRGNlWIQZ8yr?Ka4dZ4wM$jsh;H%&H(R?*59bs-zdmg z0(=T*p9Z2+3M&3j3vkc#|L@Hts8TFA>{j)6JpBC?hWvqagIpYTQ zx{nkrRkewO(OFvI?&db!ThCY=nmlzu;c7(VMrUF7Z`o?D|$J|$DaFl_?Q5{ z9iB#Y7oWx?Wb*ik%U8(f%Ep`*&ZXmfapkfZnFol>BnOi8Zbr;$j^-E$q9Qpc{;T6a zc?-qmIcX|=%GU<8`_7mM?k%&0P zRzv}(V*Ij9d89c(l9C_QhpPlp@lVISQW_T7Ir@(_{2J{jiUn;{Tir=#FWH&w8W-k% zF?Oys*=suX$yCCVsf3n?Ol|N_UHdn>qhjWcy0%UdUZWDR z28}V7`lkaRs3S|znv+KyN$L|My$O;!*?I4Oju=3l(6t@c1%|xdm#NFgT6bobutIfPEZH}fQAiTyT78CZi%jL_YRgI0@% z2$1&RkRt>o;(PJ;P*Fox_v!nG@O;IzUczoh?wA!$JrAXW!&Zp;J}oL6v$|hSLs_R4 zmy7zIWr0l)FZc!u6o31Ez~bNh7Ap5QOP~fuEVOuAe!C+zrh~C=KW8T8m??#mtAr{inoir!MFY z>gqWh2ccGH#C|7)vBx2Y8q=lSF5eIR8_aL z`WovC>uOe8HUv7=R@)=0>*{J6*Vxo{)@pa;YP;6)3S56h&5L$sdwck5d*nb%7`m+b z#VwWoyY+pI8>{V_O|kNhs=&3?D(afo<2q zcYwL>H>y7$Hq2xM7J!phvkI$gRvW`rJ8M_X9LWh@7yO?Xc)3f3KQYMkoXRMze$lSd ze+vl0KkPn&zM+Non$rh_;zpK0f^YA8zTuF$?#RzZPv6CsT@~c(IS;S_V`D?C&!j|N zbz7n#4C0Yr7I#9bbYWtUq!*ZSXFQL5v>mYvO>-ay%hMjHbYq+|t$K@cMTtQ;+8Bwq zgyBF8DWOf0LK-R__^e~fC5aSu+L%W$v-^QZx`;1Qd%4_i$cm5A#3le%%k*+#Ga{p0 z+?uHFG5~;FHfCzcEEjdMVm1R-jB-h9BECi3GaNsO20O|{J*{xv;!a`e-35x>7{Ka2 zTR2C?Vm=M9x|EbdB(g5#kOqo!*{qT>iB`Cl9HI?46_MDGO!5fDPZp6v^}wkBs~lpe zdbfwCO>->LLx6KCRtdqzEnI!W0)7dG69k!;aq#-K` zGHQUJ!e=%>*v*WxF~i}=1EvUU^AG`t>zX7Wunb9S74rh$^^bB+&}X z00k~T8q{;4BQ!TOIM7xe@fP$E#HV0loV8U%s5Zpi%u~RktXKdAM%RExFso_W1i?z4 z)V9U~CPP!=y_f+_=Y34utT0m2Ge7i2~>Ram9FC`s51Apwp7 zzEuMR&>_tL0n~dXNuXoU#@GZB@i_*};TSP&0*%BEK`IfTBC2=vi$0xA2RU;abd;Sl zi3Hvf+5ucQhL%GD;($ubC_!MmE*Ca|=COtW&xo95(*Od=yoC*}X z^Z*}OcKwkK2;j9F5D3d?c2^Xg`LDv{Un9Q%M+qjVvqW6L*SZ_E1F=<=9}wld`iA}} z((|`o|53C5t9t)WBhL^PfZRVj$mBLZFZ7*vhl_37$vz@M84FN?!vXk!h^BcEFGZ6`Dp*DyJ9RwpAgTl2yjaF0DHupGLNJ;hutiOq zTH+X!9_Q3S$PvM-Pr6jL1`g8@A@C zS%1$Vjh45d1pu|YwT|Xs#(@^11kB-f0+1hso8vr*-3M9Bsm*ZPe26I|1Le)lBtp zqo4OhYbBFiF?#!UX%K#0)$ux3^(^7S&rZiB-F~va(X~P{d+z#jl=Gm_?3Dl`=9{?#Z<~uJVjmy9$^E7?>k)zbRbaEo&=@49E)D4}o|sq< z$TT^?ig)%2P#COOeB~TxWH=pt>-NPPhozFbK9bO$k22te!ezsSpFDTrA?kYF(8Xn1 zZfe%8pXCyxn!BbtX<{wIT8|?KOYSOMydE@yQ`~#A{%;>BrntuzT2es|MTq zf~1r`4~x@leS#cUT+0sZY!8qAa^-4 zh;5!aD+|k=G|G4H;TDzAtJWQY620)>|ERmLRwo*sJx0=>IVY`^vk;bPs++nWVL5tp z&A76B?@f=GK!c3;z6~Y()VFo8JHvufvRrR zOPkxrSRs9%Ho4AfO4 zcJlU37%cNd&Tml9JbEa1E%)%Wd(0X0pC%~^x>qqZCq1UVzy4FP*6R{nSH;@#GA;Ic zcEWis=W2W2WGx%s*S(?366ee2p4r|#S?#}MKQ>FE6pS*=2W`6KYQ(sq+K<1Sn_b_v znk))kb)&;1^yl8YG7+1>dh^&*HA1ry6B{+xrDP8rYP-d3I=>BiI1@KUbgWJm`Silu zD?w4me{bwBh3yv~yPtX5?)B-$1yW4m;IDEK=J$`SG21Pin~(EDHqU>tH}=I%Ah$hx zD&)Z2c~$S4*Hq2V=3;*s)x8Up*AGv-5c+ynhSBb>H#wa9rHc+GfZ z2Tz6LkHieIihsI&{A1LK7cw@QlG|mCe;v7v(EYN+{tI(>M)bGe-sV8`%@-2_ZtR&W zd|+7Ps(JU*_wSD{aznbXAeU8cl8mKJ@SfS9VEEsx9SUDKhf zDt$F^;K%HHF}Nd9m^=1f21y0>T&<+B_Ew+k^&}ad(hXH1CD?QCUL+o$;S{E!l{0*F zr?09bo@>s1W6xmy&PY#zeNr9j3J@ALI`0T;zz-(qY2{SDsJb-vpn)H)$Yr=Bck|SZ zpC3N1I#L1?hf!3e{g%2TxFY!Uph&OFQjJP|`3uRby*jny)&X;C#SzJVZt$3|)FsM8 z#!h3a!=IDR3SSP|Be!rZ_9`PXLO*EblYLvq9hjps1Yh7!-#IfP z6KA^FnrLG?*P7QOoW3CP>EaoM6=5mYRI4wy7dNQ4Tu^xWx9@Q2iX4rF2ipXNt-}&) zCuBY@jUUWnSWayWgx_|q3}ZgMP!UfKTdRAZA7Cf+nrHmG)^fnqFkI6RKD!G|Qd~&e zIfte(p7_e9-H;O_<(PQqz1 zt7Y2w&0#$Xef_k_DV^S+>P zPEo&BEZ$fXP-?gFaRE^3A2FD-CEA$Q&E~np1lJ&0ZSr=ros(+vBf2 zl?>)PC?N1#6gg2QIMMDyOu=?Hu6F{B2xXIEEfb1Ed16V&>cU59O`Eji+Y{&36IEPZ zo;@g7z)z?6`0yh_eG@Bg#9NMN_uay_l<)Fmf^$Wqh@r25zJlu#Zs&Vkh zFX)M>r9*`$8`sx zIJm+h+2qvBtohz>p#o72G(wXBpT1;*QdvJTCb44IvBHPy(2NTj=rfvLfI0}?`Z9aI z9BjJLu&=1|UA~N+pU{VE#>wXgy3)+fH$RRK=_7r#GJh7Z{-H9Dd`JFZ@z|xjR@MG9 zjswkoLWXnKyKWwRYGyF=EkMnuZ)Nc4xs1+RibMY7L!Hp{DLC{>WJNAwXQG6$?Ju6b zx?J5aCzijC@U?x2y7t8&Kr`T1xu0r}y50(dif3HOCTF87_U1eAneD_maSKplvylRp zw+~>es9}r>Mcdam=nK*ps`e9v?oX|sZi4;d9uVpKcpJWOSXxow)ffNsW19%dV{T8+ z-2x_uU!*Bhd3J73E`#C)`%}eRc|Y%XXey;M?Rv5|{q?=Z)8+6eyV={dH+tN@9?)#3 zvszo%D`rKg?n^G!Rgqn3vtQxL(6wG9K$i)uL62iKl@RQ+d-fZVxH^?u~HayzWo zV&=sxw6U+VCU^{`yk%HB%3d8&^E)bJ9kgiNnjLV)sZ(EdT=HO~yn${0e(|S-+kDq4 k`P-f?XZY10yPH(he;toT3GX=3`_kO_VFx@uyCH)3KYi`$QUCw| literal 0 HcmV?d00001 diff --git a/modular_ss220/sm_space_drop/sound/button1.ogg b/modular_ss220/sm_space_drop/sound/button1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3499e2d1722e6692bd1e60cccc3e14d8d5c90869 GIT binary patch literal 5377 zcmahsc|6qJ*LSRAZLFc`X{KkySjvbPr3Yo1kuZ$4Nnw&Slrc|9G!H`}k}RdEB)g$( zV=MKPrEHOgkP;Ok)l;Ihym!X)Jn!%Q;d(J)Qo_p@O_ndJK3UUKt;BOe* zw~R112HZgWg7`fw+&`EpBq7*M%bY_>2oX|`a287b3qnaDr|a|7cEzxt{{c$k%WCu? z*DLtY{`Jn`L70QV{vIOb7!t&yrZJ`_%8(nBNgLYoxe=T5QS=D3sU zWMfOQB&-nMwx@9^!^W~O2Db8QlRb^qv1qXMD8N$aDkoFr=` zmZNRyl^&;K39&>Xqy-CUD4TyeTjGAmwMMSyOcYk2$X>|W_oSaQ!P8`W}QHv8~eN=sU4V<+@ zTAY;ieGQJCHMBsASg*?Iv@X`-=n;`?I2e;aHIN2CZk}#Zo~|rPt4bE!2LNT|s@i@S z{opM6K_yxaso*UsJP{rfk+ele+mILT%9 zJb29|^gt|+>n)!H=S^~3a=m4jF`dfD-W)w4?QqYVJzS+Wh^;G+Ov_2Bg_vY{aB7ZY zCBz&WA}JRgg*2v6m8hF;eS_wz2#3YD8nQ0-wnEIg?aebT>fb4%c_Jsn{aT?CQuaQ@ zBOguf$JiUYIhH(Td~RO!rOg&(E+xYG)p%kad+-XqVCF(3@dDV)WtHC_z2hi$iVrdiL;8OtEz3k3AIm+=4!@p-9+yj5h%;f+ih*G-);PsfqcwS&`x zBD0DwRI4{oS-_Mx4W zwFMMIs+*yJVk>Z?{x@*yH*r#dj+GH!*gI%Wk702dNyhMel5PubiefE|pXxD+&0SC? z#&O$Ki8g6%StQPR;k}XouJB$F?h{(j;XSU?INKhg-s*xjqJ7D=$FAhcLXC}NZN7WR z1Q!mcbqll{lUEn01|(HNAs`JuxvRZtY6vS;0RBKxWbyGC{yq4~G)f2IHJXw{EaJNL z5OptQbP(5FI;V^;;08c0H=~F2ihJ%6Nf*Y)9R&PrbWH+n0ZIpq9YS}XGjUSYc2co* zR;3A4Yz3Jn-6p24?o=mLCxJWFTir>JsqM7U$w`&!reaG~qq=1|Q8VceO&CM&)KPUR zwT|xl8O90g`9`N9b*f;%iCW8o!_iE}X!gIVsDtiQ-%V5j-_$jN=1Qe|L(RX_2l-Ub z0hW_0ZP3kWNR3L(q7Dh@)GU@?1eNAV8yuv1evTd*h^7s&_G$<<4+>b+-&uYGjOW=b zn%6p!RWvHJ$`opbRxzL|&%bS^4$ZR!ECx-*c2KC2N^W81nk%5jWc_TMK1j4S{~ z34}?Ei7d=w8B*|eo=Yc6V>ubdlNe4KWfILv_nG0wxsXE&GBSLUD>Kq5Ap~`p>&IY* z-V;~YG7jPscoKku0P?8;-j{=NN)L3VYDZqyEiEjY=Ktz_StqHqw3N??yo`sxjTIHX zB1&UL+05l&5yfDp8A_FwR_J#&hn1GXmll>4?=O~4H$qC)Te-5Cjw*u@e(0)u(~Yp= z;4@}A4#P=H&6Q|-e#KIw(YLlk@ZH_=Cju1TNf0RQOllL86F!B3(8M-OAc}Gy!-4q} z&&i;`lq7`)Kx~JuxXA20_~x(W)eiUsl*2Arh=r8Hlqt%a|8Iu?6ct54S+Qw9*+6mG zk7`0c;tSDn@)q|pn7t%j?E>glZd^KroXMn+NhP%d!e|wGZy$;hY}lq1(v5*0Jx%xw zjRs)%L-!xs zb8i}{V;k_tKL>#1WcYW%MYoX&uZ5+`$>kw)C!q}vt&vxSTwz8Qa)pIx7d-Pgcp)z_ z6-6bfg@}v9Ml26)U=1p&ReS%gTCWNx3+q<|U`r~(RI`bfdWd48?j;N*VVxK|9Bx3^ z=sF2pQd8^T@ zVMG6l!(rCo^>wd5b)ooNmD*V1d@I;>5XAEht}Cumw>(FuwJJ{k=GodATe>CU%YvNd zV^e_hrBr1|+~#?Uo!;_cF>WwiL?s-*BuYcnm>kFJbSN^{JnkT%;qQI-@nZEkmRx` zVKQIe{V1_3N4Txuu{CUFWP7vKa5pHEY0aFTZXC0)w4@ak&7;#MeOo@&sBVrO+?kEr zexvcL^UpVWa)(S$j3d%O*me*W7F#!R^m3NxIh=!fEjYF_rmx{e($t#*q!kyKrd#_+ne~hKo;dVqR<+tLn8@ubySKru5eIZudzUnx% zjQ$2)c-_4NGh2^E=p60LlLW65#KE)cTk34HGMDz!S1AsOrQi-`Yh5!;4$4 zZdNH>@(49Nwg$D>oPf=FWK`iLSgUro?{t3P8|75v)wz|%q`_4~hd)|LZ-q8h(f@d@ zgAHXA_a1)xzHXhQ%(L4_ZO}$XSgle7Uwf#t9_=W67~W!p)o zeP?%8sTrB@zJAb){&RhlYU!7!*b4 zEXHznJdsY9x^rM}5HPC9ZZU7@KcMCRXvayH>g>ab!&1sv^fm@I9=tq}Y$uawKlE}z zMFIJx&%3`pqkkpeUtGcBzD|KNFUh9n@SsUoWA(YtlPk7vaxckUZYzs(PEJ2O)1 zT;WcAkAIHr`m%e(B(Xj4;<%R4kju=2mEj)E^Xu!nfy`z5`T2TJ`&XX!F>P~g9}1KU zYhR4qRJx?RByf;pr$~TRzT)f;SV#W@-~G>jm_6yTeN~+EL`7-7Nm_AkY`+#e!39N@ zv>iI4ug4W@s*~QI6}axTWGqjBQE802R)PL$q~TzMVBGf?G&ibi{osL1a^4~C zH>K7J%2^nnGZX%(^r8CE=#?+lx2wvgGsxzj_P^AV%IFdIuuqxr0D(W+!sLr=@-`jU z+2BiyzU4_<$G?A%%r^Q&(K>a+;``;vh(HCb#)S9C;nWyAB(2%tckG^iTK=_z(|NT+ z8;0+`eZSkH88o~1ki}>EZ&1Lb^_`q~<@0I0%wf9oonN*a&9JwA|fCDvS_=vrIQ!^mUb7C%h1pDB6> zD;97}-fOr}c`e4~KzZFS#J1>f&r#zaR$%8Qel|~-7e+=$seJs@S-Ng%`nT^zKR>;F z+b#BN?%A!S&JDM}{na_zq{ECItP_DiK$Q?UH}kToG$*k`;4&ndxfT@_v4mKiSuU@l jBIZG|7tIm^4UD~okOIK%nFfq~ua}`Pc10qQg1)H=jL@{9XKR{{yni@ku z^$v>+-R2r~7!g%`GFxKz;8AuRXJ%k(%Kxfm3MZco)y4Sa9}P> zGzYi+yTju`0o6uYi!*6rDWCY-av90N5CY;#h5Z4F%;hpa?Nn|1_ezYVZJ64#{4 z>9i@+(z1QiwQrxokV!Zqt;p>_y@Tf3`1JcfL94*94SDJQMqvq5wQ z(tyt)t;8X7${}0VCmStp)2S6kops`7Di(KuAUAh;{4rH2v0N|&Nf%kB@x9adp=mQI znbMqO!8(WyK@wmYb35`Ld+xp-56Xy;G4>zLFPEkv76(3r_lJd)OQx8t*N_yS12BWF zlxEVx{@clH1W~bArV96*H(BJPm`AL|Y4IEyVzTqoZs2Bk%ig`Zrd4O+* z*HYvoyN2o2#`NYHh~|!U&mH0^wE=8vRZLc1Mgzb$RE1^cIo1Nq;YJK8-%&Kj6sZz- z^R078o{DH#cKb$des3$lT-)ZJ@!b0UQ`TU=@wsmmhP$1aXHiBtGFdyS)b-D1rw+Rjuid3~1#~Yze*Rfx> ztKZ1=lew#kmAfi_z?{;jMs?rGaNj{2u%ME6P$`}auUv+okTrIJHntS^{6891O1wp7 z2-=mcgUQ~4$)2>#)FoJlwi`g!lA;@#_DVl<(lT3@kc|$@J{*%311V!uGN9o#=bnzsBh`q~} z7kL-?0IQ3SGV1I%U)y7!iWP9ESM=JW@z()Bko=<>)y_Vovod;!WK1C&50UUgWXgX7 z=K*tP72sGI(S^N>D5z#^q`Xmnw=k@uTj_F!_)u6Om zAOuN)pWKz+EH#+5Dg>Q@lVmYT+`w+kOctpFJB=iz;jZ$?-8lUMZU=5_!Fgp2pBDtE zJZ?APHSc^sK_A4&T^RV;>YE4SA-Ep&A`;nk-rQLg?W}@#RizH8;D>U|yUZ=zJt)qq z&O;s)A9d%U9JI5Uv$HCNtb(VgQOLQ@lpI=*Ib+m=GNDePG}8PQL7cFjn>mlFQ-+3} zDGe+zoXBBJT=+*7WyFKxw}Ubyv~Z86x>IOAK=X0hh>+qn%yL$xj*y*4)hLu)%IFY{ zlFRasrck}8BO?^A#kkSoIO;Gf03p&mGQ^@BXZa5^o?l>5y|;?3qEdiW7C@~ZV@i#y6u8GfqdipO%L9!+^>5oJoZ?aNnhxwT_Mtza%d+R zV_qRty~oWAr zL=3vYjd(;U2yXDOB)FR(!>?B*hGDqWo5WT7` z1uJujNiv-&;gWm}`SrOtdpJ8UD0-hKN7 z9PGRWK}@Y}^`xg`XWWRQeK-S{mnOmlVRLSdMA#%SRVkgBMtHtf6; zQBeV2T2NMe$gh}h1~YYUWs#O;hP@JH-m~p$XMt&2AEdv)FSPL)ho>=-`XO< zySwKe3@W>uJf!53*0xSg^b`gI6WdV1a8f&p1M(?`!zF=~B#DHebx!*0#by_SH-C$u zVc0jQ3Uuirj9vv&rZ{i@za0!BsVG9EjXOe#Mv7~GR1^6TQ;JNK-}QjY>?P=<`M|Bb z#B35Vhe;w5${U77(JJy@2%HpV+@?wILIIDS#V&&QF>do^_E>?KPj46=XM!Ozw#P>L zJgKr_8p%P;sr=`&ZR^ zMZ_$sUtth?gCa;ZI|P}LBy)9dQ7DP(#Du3&Mp!ck+_cdS3GEFxC=Qs``jGt^ubU{c z+9l?}F4*9b7GGvLH~}aDh-3u0mo*le~Ku?9Vx zE&d#lxGeh003iAt5ix2Je|n_6O<%~n$S=B_Q&3c*y;%>VCy*eMNU!F9FI!+o8+>;t zS?!7c{$=pvo6&2lt2_OXqiP>dufE3yto->f_}R!TWKJao+HL2rR38=8&-CzCmHcA6 zX=+WcFplw_@!wE#gU^C;6(Y?go`z~AC{BERXz`jz`xgJ_VtYjTN3$or8=Dzap&y2$&Kvc(90U%?XIXPN7pQ!xcuB|E)Tmuk8F0@WtKL- zZhO4Xot?hJe9f;0)~~^s))4eVPcZpDfAX!fC4|)V@a5Q9q;~36R$iI!89TM_Zv1ui zo=q374n44doy>S)@rvR0PX3nf#qXZznv1!EVc#1tdz9`9OMh?l-O#;3J<03drf2r} zI@SI4-%&m8*^y-SN)7F*Ni=FaBP+PSuux1){@H#r zOGf{2!*=Hl&M=Tgpz>O}ge5VsCt&jhwGIxzAZTAp4IE=bQcF z?eXCgbs>unRmZ4Db{9YW@UZPvlrZqv>8(4!v90Y58OW;*C{A_*tsC9Bq({bO8w|o1>^L{WgtZ@O{3onjqYQ1HSO~obT zL*{SlKmBMpZl`jidodg`ow^H^Y92DYJZc%UA-2}`o@eQ^Z#25l*6_>I=&dOVb+LEs z)qWkzI5dfOyqS>q@kFd$^h3$70X0xrM;mxzjHkzYmR1Rc*pSrO?9q>kUS2K%u-!W{ zyyKe{E-o76T}oP(Z`ETx8g0^#yVnDa_1E^Wrr@ier@i4=Q3hp zu|&QBKXoPRW`_PUQD_#t;#3uIE|G`K5Sf*A4j0>O_gapQ(n-E zD&Kuhk39`LXiximr!l!7Z*rhbeK74$_F0$D{)ro`n`R)k_ueYRr#id6tBhx12U7%p z;&o2W>klXyLMSwPuy)7k{JUON$4?te7X5_Jw_dD>KRC2Lx^Dwz=f=SB+}U3XR;AC> zE?d-Vm>l}i{^12tXY#^np87~ibp+--b7-mg7uj~>iKf$60!Uw`CN)k;dgK~4*&H>} zv^javO?PZE?N#N(E-Y-Xy+!!VsWaU{a{J%zt6J{cm7%5ZZa#QD+rprVBe4?r)T(cZ zukFDNR|((WBt0JG;J>qY`wVQal9$w`qF<(>X33Y%9fMY-()>bP^)(DbioM+foJlNStAo}lu5Dh%68xuY=yI(e&MHS<6dE0cOuR~40#Ai> zZ2o#aX8S~}vQdsUYUeQ<)$`ers-7O|ggni*OQy)*H0X|GSHY9&=i35&7jX;{ z*0^6UXMQi2HHd`ey^`3dve*9YF%80%x@@Pnrbk+P3dl32_K|<~OG1@XG<=q`a#YSX z*WBB7*NR7Vie5drcspvlarfhjdPQg^;)h6s=pWStW{{Q)ft~5xz0CqF!>t3tctUuEdfz5k7|~?@QnTy z?qY%usrCkGfzH}kIhZQL8!x$Smg6@)E&MT7Gx2)x(jvB91^@nyU(uM;{OY?3OV4n# z(iDgJPuI|i%QAYG$31Ox8)BP1Qmx#+7(c7}x;n{9ex2e}O>}H-tsak5JGM|@d!l~- zm3@?@vg#-2G6pp_1$r&~5!X~C>TjfpHa8E8RsRUf=;HbLTLl}FzWne#)NkSV@%JN`%Dtnmh)(0B@)v>p z_FnltSJBN;gsLEk)A#BOe{|-Lp)<@&*>8=4&s{peI5V1UuKD?d>eNW4lI5Jdxx^Fy zN3*9NU7S$+{C-wWCuR#AVJ2x}K;VVirs_1T-hZxq9f1n)5e&=x`bYJVSV@ih3jT^^ zw2r`mv1^xm{Lzl0#|nRSFN5jDBN??-TNmJywz~a%j-J4_nor^%2WMUw6Dj1w`O1bG``d` z^^@1f+TwwKU2VL5R5|mHhkLHwk+R3uZ3{ywyy-8WR{C+xq{b*#rf)p%+Um^%KQI~( zaqeZU>bK+W{CUb-<=xjte@%P-*xU(BPCwyg?m;iJgJ(Z}cH}Zn)1hY~I2ji!0+sZ+xv<4e(5KIz>lIhJ66P=55>!;cAa5sES64GDt1714q4l@! a_^^Cu-oEWh0L(IX$3&2iFDR6(fc_0;Zz&%D literal 0 HcmV?d00001 diff --git a/modular_ss220/sm_space_drop/sound/button3.ogg b/modular_ss220/sm_space_drop/sound/button3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a28da269ad6147eaf4b02bb7b1f738910d894cec GIT binary patch literal 5381 zcmahsc|6qX*I$x`QpS>|5yo^=*G&vDA~BYjq%vhM z$_R1GRwS~FNh>Kt)XlZrl-_5?z4!gSf4raH^Lf6{oadb9oaa2}Ip;ZNJVHZ>kRqnIYQrq9v&7E70d_@k4B1g+5kQ;g2NtH zcaobUhG1*1C_-Sp_F-%tm_cF35MEJ-s5FVSs~c!L?(vp@>>)^pp=RL3W2mweG#owE z$KZ}Vw2$hJ`xN8hX8Zgf>oPL5ii;eR{q@g0%^*P{hO-VQR9I{Wm=;Ud);BXj&lW(* zXn+e7;S?PI88GO>fa(C#WR00x%O$+GUV^hQXkP_@n?$gFa=e?LP=N-Ebu3*x6Qt3T za8`?vK0Ch6^sXvP%2NMa{5#V}g9+;$lk*d>mP;C}P=^z$t9$4;xMUkO0Sv5jVHdlkzjMjdA!q7}`*=#3(c>C%HxskFK#(V14il-ePRthsL9ilgHqV#M zJItO)PKU9QDkPye2$BNZSnMI%ICJ*)dXa>D`iuYQ{yD+wVs>Cdh5oRRQt4#VHR{sh zdjM+0DY8x5;{GvmoElF4s!S#N4R@@FET507Mr(3iYGX1B*!AcME~BS&oQvuK&{Zy3 zE+4F$;IX@hb1|nQ!&xeCt#SQ>%uZ+paPpbvc+RCu>eAj9KxzxuH3S31v zhDelnm}>t3=PHY)B~A4?1y9=n|t7oDg>8*hQMU4B(H z)pKT#jc#{~hn*iQZp-hIL$xXFF|2GO5b2gfzO-5NM1H~@Z$DaPEdht*aR{f)6^Hy$vv93Wyy%wS;- zlUx_;|16QR82bwJCFUXDoM7_*>8nQv5r+WIzIqU3hZ>_BJ*mS{_~)45LZJv1XR*Iw zYjj-ub)NJadCXaODBI#yFas8(zKs<84m#c{c)*fEw4#u_={`Ahe?Id?Zt#o6*f;;t zDeJ^XRDz(LncI+=+Q`f?>vSEg{ozLjkiE1hBH3^C)5okcb+DPbVVR*ZIVBhKKU^#{ zC=)M%6huozjeY$DyYvLRYY}<4n-O z5C9;yZk(LRy6{$%4kpUzalggt8T*uNfkAzuS09bPF93q%I&Y~w?t{B2=?VzOB%-l^ zfDsT$|E;+VShy(z!^(&P_CB1|V_cGfl`+m^>$mAl5**ecCwoleix!p83EYP&Xvd6> z94sqO6jxFZ9>f*u5vmOy)q|hX!StXFG}*J;;d+LKkWrPGF;NaEU!={Y#uK^!7_x zN=P1;3aDI85B5Dbs~@Wm{Nug^_#E{uf-sPR9yAgGf0AY4rlRYnjPX#R2$V5`Y>Our zmUu6cn~Iyji$qp+6J+bUnY+2Ekci3{(nb<7$BmR7+-pG}_9DGfC6Vfa{TG0rFyENF z4Xcs_LvEy6CYZj;roYPlR}@L;Me?^I3HX-yXbPSbOa_vV2MhTmpCP833PnhC8{SAF z<&cI2!K55!Ks1TsLlFu|J`1tKL$Q=0<{>qaWTAjbI?fCjqQA*yQhc|IwW5%KR+d0A z(25R3`TVUjX?UI~VA3hd7@B)_SSWeP&1WIeUzj#F6dS5e$*t*-S6aY)@-Puvkjs)E78;-DU^4DXH#E)2=(_e1LPJ#nd(wSGiebrQjEJ@1Y$E(}%c zO{GFXsZCt0ukO!g&Db;|GihQU_?NOw90#RUdB=3$l?nq^nI}V8IcEAEru2^J9 z4|WPsJm}yo5`{$qt&Rdwu2>XbjS-IIYv96wC>j>o0Yn+|U+#oeCVB z)5M!s=<=QiR@8#cH}Kkg38f;A@@kUM8hDr&+LCpw2Kwi;|suN>L}2%^nPJJhH>)g1?jv|7H}DR<+c z{fybB4tT-9lnuIUojUectIOJGno`)adAcQOgnI@qo5Eil^i*ckubY^9u z*J-ghW)lcj24Mou%JiG&CV1j#JPyY%wVIPjprKSjt{(vz`e4HKwzp7XQiT*mkbvaU zspP`Y{IVmD({*DC^~VvNyrGvF#K zt1^7te5|YtytJUK_*_sn)c`OxGwaKzyK0PH@WVH^PBnmvgHNCCiUf<6o2%i@{Ho;! z({CLS;N7)(AOV%!PZB7)vpXc$i=M(DpkfCiNP+MO!2I<|N|J^{kmNr7HDa}| zf;V5gqISrSS_y_!5k#v5DN~#`|KC9ZA}Gs4grBSq|>xC!~!i+mKXipHpqUTTxz<-Q8{20Bqz~@tIhh8$k z6n?7L0hUE5uN{Z8lM*rQT-|b#jTYGsm7`zJ%V7N>ML?3QJon7Jjw`V?t&gSvXatTTTgO9w%-YH zQh$G!B&$_y5#){vDsJ;*l!6<8;sLvs1SAcU4T0hwNVH5KCZ%BMRuJTn+^vw3lsNLa zNC}~RT{5msDsewla_g>3 zkU^ml325Xlq^+Ib`snGik;%_XkPJwSps7Mj5M;eKE;)JJ)Xc)ldZ*29dq?0Ct1T`r zP7K(CF)mL0cSI`7M2vz&e@8?MJsUS_|DvCk3@2v}412or5 z?>%bsn`7h3=30Ru%~zO{H~*vi+C=fnJ70e!Ou|S=UdyfaCOfBHl2DB8oTb4|tsuYK z%}0LKHkm`E|Jl#G_w{VwOQ}M;8H+b-QF`AlFZLsO^VD|%-OK|2fCbd|8SMG^+$Gna zcr({Asni*%{NyJck^3uK`qoJpZcTZyT=!$7@BG%SC(or^5O7Fl%9k2~vRl&*WbeK6 zaOQl|J=>438h`N^e}#0MBbSF(E(ioq=1(_t)s%-~;8qn?&tsHM{jdo+S72GHa|%&j ze)(6jAbn~o_kr%crWBv^f=}Kh{3~NTIpu zV$!vDZl4zxwvP`uCG0|LPR>PNQH{3m85kHKuGQ8q+_2kO_vK8(aTnhm&Dn#4=Z^JC z$SjO(gM5b`V_I5Fvpjd;P8tbMS{A448df`+OwQFD3YgyX9`!Wk^_;;+t};Vw@7b?f zH=iuo9;-V!F#Ncr;jaJSTnPF^``)7wCfjztkKe}gHPucgJ)#tr=uX0F>C zZ(<(W$eP?*cbkOqO1rz9d-Vvr3>SVMHW;d29$qkfI4SPg{`EN2dT6)v{P&iI+28A} z+8Z-}&meAY_PyP+ZPU*-8qjTDZ>6y`*C(gagD+J4seWKT;lV5BmcU=fqNiH&4yc-& zLk5XDr*?Dt{FXm|d1gOP{Lv{aJuz@lwd%8=?E9@A=9oY59IM z3obdPa>35~=`?nRsEoYuT6LtW>Ae=FQD#^7mc5w>$*w&249jO$7BYm(;rKjv(z-n8 zwUb*|jFs{cTD7g=Ul+I5j$Z4uz1^02Nh;1VSklSy^TNT+1p|vaILO~j@DXhueP_w; zn`+PhG*e=|lP{Mn@IjTlJu)tgIj?C*Ii1mB__^M|H)i*?EuEJe?6yyCNG-R}OvT?i ze(IZDq_g&-#^p}Cf;CX5%V3W6k?h#ca=D$wJ;Tpnyk}jbk;CD04e(6q#L&#deKQSf zpl0W$`HPDPV7dQjG)Azp($D8{9I-ANMdb4(1(w9!r zDFPR3yWBE7cw_$_#>4REc7yT(zIW2vhFUBkzc^{n%s-UI+;y|(YY%-d_nu!Idntcl ziyx1jI^qZ6*Z6YZX#CxrG&6B=wu!E|2c4W5ZY=~P{w$7W` zQIBTnr=N7}wHB=Xm!seIEBbzFcW^D=Ib2*CZ;el%#=CeBT?$KDzuatHY^|i;s+u-= z-&A~bE?u(TJh<9sf3mez%+bNh*(FTmqUDX#Wk%c8UZYi>Z#)y!KDOG|D$2f!*UEA^g^iu7a zL48AdDub$znY1kAnM{^h9jE?MPzMZ-}_uVrNp7AjC&e6Wqhp!|Ge>7=)_Lb zw~YaU`#8)#qu7Q9gG;+OTOzI<%R9T%1H?xA>mV1IBeEUZ#m`5H4{dsjKy`JdO28}% zA>mlV!osX@;^OGfGoL#9m9jqt3|J^15zZG5+SydUyX}0urRkUbSGIP(zvfT6^)S*% zIjS)C3{Czh>fOs-GhH)^bEXM|kwt3D?N4ycL>NJ5Tne+)DOdlz!N|w++X~L`yo0=1va5KeA2B{t!yP{2rcg=-fgb3ne-7v);x$sp|8m?Fpl^z^Ls==@&&< zZ|$&|N1J<49S29a40+oQwW6-)N{2>QPVNYa7+Xm{!Q9%=y5hgw{BhUqA<1R|mN|d0 zmLRyN?$_F&UQ*GEU2}yT72&=SQvFK(Bbhv>L<`}ctV$Htm9>tg&l^PD&#ydQ@%w;e z^Q-+ljoza|(@ll2>+{Y>X(rH${I!Eu?2ajR4-9;L;crf{k9PMz{n`i`NhukSyV5Z- J^5?y^{{zq2Kg<9C literal 0 HcmV?d00001 diff --git a/modular_ss220/sm_space_drop/sound/button4.ogg b/modular_ss220/sm_space_drop/sound/button4.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9fceed1611fa0afe1a9a7e805b5e66c21bca3084 GIT binary patch literal 5118 zcmai1cUY52w||3xp@;z@O9>hfgiw^wB&@K2QW6Ly5ULR*RAWR4aY0u%3jr|{F;WyG zA`(TK1|cGdqCixd2+}RMNJrFN1^uwxN!Z=H_mBI0^UOOrbIzRKoH=u5&crJ^+82_7 z{whOJs|3S>dL6bAb|@|(JeDD5!B|bJl7q@H3DE%a5^Mfb#F}D>g?n9((%$d?D#~kC zVT^$^F!o@~R=&R2DPvejd(tj?9SIIJ95FUMdYHvpRvU(@uXF40R(HK0}R-&~)#+6h0=cOMc7V#j z0bZ<_hj9A4amK{}sUuvQJz-{}m^x|m3B`8C1tI`%2F+gY)KHXKg#&~2tlYd)WpOho z_I(pWPD-0ugBn}f$}lVCwb{d`sR~XRMX7kJPnzs#$0W7YIrJRea#Lj;AF8um9DxP0 zxCSJ<)3IEWZG?kwVxui1HbA)$R8nflDK(TwXx7R@4V%-UFgJDH_UP%4$H#=YcClmsai5d=7Go?Cq~_Z;UIZkosFc{Iht_5iAs7o=DO z#!d6uN`mB9DFZ=rZ;_Fh7vD1*##0snYD;x;Zc%nUpk%6JbBf#rfO5N)OgiT-<}t)j zl4h=b7R6H)cgve^6`bpB2b7m+_5}~|&k)HtiIc&49T4f+d!J$8ebX^$7v*qG^I6B` z88bP}RG!n^lbM*ZJX^Saemsd_uH3bWv)Ze=x1OoO@D#ajbGUVosTC~N<3eUEyqtnZ@&s%gKuRllz@nHf1$zzn*1 zG-No9vV8P8sGpd70}CR9{!d+9IyiA?5bUc9!HCouUAP&&JjCD21RDw+M7m1i4PUG0 z-lx~yXX5pzrI)Im57N2clKf-?#b-O+$2zj#isEZcA^Xz<3g{t1=2&6m*z(br|EiR= zk|nA@kS%vJhO3L=PT1t=;T>Wg8bJ=S;uFdF-7sguhO39?>c?`UlMBkv7R{b5HmZ;e zfe_*$;=;L{#JQTpDNo9o$>7GEEhxWQWZZFip|NKEzf}cEfa^g}qMmDlo-0YunFI)l zcUg*J@1k0
+Zoqd+8YkZ<=2OJuZxO!>)wE+;M_~<&a^9hQmqCY?~CHtBVkemm6 z$^Weo`z?v8z_D`T1KWaP_n4OF;^j=wa17h@W=M`}F*7}8DJ9D)xK!Q)B+e;URDfrn z5uYn*$OoJ&>_coDDxt?`PS3dqXQa&+;asm?dg?gfHMjXi3Ct47RNV2c0GkF8qw}42_k9=%NAMqnUS0j^eMusebIAOlDAdaY! z2L_4cdM4;T&!;~x{0E9W!SuFKsGATkj^$b1a2Tx!#knYW=JTGL9 zsUM&$XLnoD#}X-&?UaBaI%Ru$(9qFPKXPb5bzWGH)L@MyFKrLd->c3V|#mEz5}TCIyK_iIOm@m<0k+I)v#g%G)% zADKiS3y7i^bT!gZP1h`r?FG4@g|!B9V97<6NWy~$L8-Zn3=I5KI7oh&Gz5vGo|=m@ z(5HG5F#7f0gni0Xgwcbth#tHgzYa-=#pLw`WAugIgv{#tU|*UbofNFVuL~r^V(a~> zv}#cXR_-i=WIkP%M+!FP*A?Jg`HWoBS{*)@l&Q~GH=Ztw==GUJm-&%STrERV4fRD_ zQkFhnGlXM$Q=Op%phzbKK#+-fphoRcrg{S?Fgb=_=TF#Io#06TP+g9A0OgLyMD^h3 z&}B~@UBys%46tfHfO5xUh3bq07@;O17C_PP7!iOn6+W|tSEu=fEArch!@F+P`_m+o zSLyRd!>j7SotfuyTqjY`3gI<*@k-0hobbyNLFjp@xj3?=(|e+CCLq()uD-bB-S zntw)smA9!AP6*olX_?q*Z-RIo?sx&1oL)V+5eUSSUlplSdjz6AzO;Iw`Vmjl!QG6- zW)UiNU-cA#!U%b^n&zQrDJBpUCOL9!bMKgk1PCn;L1yXLX|$z0$YOc2;B=nm;@0Z0 z^USBw>|D|`ip>q4=cRfRX#Bjq;7matmqf#=fm}ZhGIUt#<+k6UwDc-zhy;TabErYZ z(M1*eI&<`siw!F-SI!AH2NfG|Dk>_3^yFd;_-(AI36XFbYbxi9VsePkRIp0xhGA2Br)jHP*UK~RDd`CPOv~ov)auwFBG@5-8 z9R&C8j(aeuyd`}=*^?uZQV?H-5x_(dIs!p@h-QO)iecxGKuVHDL6DS(;TnnArQpuj zt*RdkrdER{Q%upSLCTcm&HuN7K_pcrh_v21hG3$!>ch$W*0QjK+0&Owr;TA(jPS%pl(hvju7VwaQh>S+43dS*M?tK6u=~^K8EJTqH3T_kbRkZpr;WcWQ9+1=X?l0DoBkrIeK3&=>>VDTdG`sD1Bnq7HRuxr+3aFvWK5ZvTUy)L?yz@o0x_{#SS*%=Z~!ff zCHXrdE!3B=Ao1T3@j#Cp;g70DrUv|TrDbQ%@X9xB+PD$D#qi3))5W*Q<%-7^2xhU) zmg$$*zReX(Bpp69vRrnI`t9W1C5C!giBa(}BBU5Z5*f;3z1JcNWx}#vB{XSoe^fNF z5*_7hLUftyx*!(gVXUqt0W}2BFs!A%hI1w#`$spUb0v9H`Kwe!tzU zMU7wxJu`_RY?!87cZ{{ruoI!zcKfG02BN~yUk{ExFvz+wjfU;VtDJh>nepbs%_xh3 zKe+mfab3*HO#&C=<3Ch6-Cgl4%Q4$^v2km6c=@4S^9z-gmETL!G^b`~XJbF#PBWu8 zbp2=SoQ(X77ggB16?*({Z*cImRyIl_Fiw9qQeA8X( z>E-3VG&U9@-QVAD3q1zE^)0){O{Mm@roCAh;t(x=8nxpGzo)6oQQLQL*Fj2CV8xsb3nTzB0|R^i@r@J~fw^}BN)RNcC8XlA8$GbIpl@u~Z| zx5mC%RDZKe7Nb>h1rH7{9g{gsYxUJlD6_or?OLnapNW6)kL*zVvZQ>E{KU$pK6`1K z(?J-ebH`wd>Fd%k$E5ZytG4|L=jm%4r0iYuCtb3?{(Q|bp>RxIrM`8OoZzhTu)K~G zOCfCgIK+Yl`50szreDmDZbM`s6)4QW9 zZ{_Kx$>w@RV%vfS#={9ksJYlml+`kFy@tBwCgaRfvUkm%ypNiWvoD(28oJ_8v+ma* z+!$<0UV*iS^@GPFE&Q3J5MplP>{q;=kl+0Re%T6-*?of~ogve{?@wou@w3A>jPIxS zd|0r<>p9=qhStKo@ZoP;@bmrB7udca{Gju;vv@5=Cd+>heouy~=7z|sTbs7+DgIS7 zv6~R~da9ceU3foGH&iX1ayw^poGp={w#zJAzf-F6k1J{}1C)E-@^p*E*AOCU5vGi1$+M{oGYkSk@ znT)>4Z6dA!Mt-qL)uYd!T;cc>uA>6O%~c(yf!r?nP5A98fa}cZBSST0lTi4dI{|(sOLNv z=Kk2c@3>co{lhlT2`Fs6gMqXQCL%@U{h$;L*)QGT8#AtM7w(UVwQ(qgU?X?6hkxl< zST3+h95+ zHRGWSL(bq#osa%#_Wrt(nubzk+{q&Ri1oI~-4FKqpId~jw|Aw}JEI35SRuz!Wy-bf z7q>iW@mJ7r7>CAXH3BrTrCZ-9Qcm0O8(E^oexrf%F4s*`TgNqF2u;Oy((A0=7llnm z3Hb;_&}O$EzNh`%_;mfnt{>m;UwcVWcSxPi#^AFHxfvGCCK=FJ?>Mwpk5WOR{6 zFIZklAIfUmuRWycu-}h9dYH7r-Z=9#DAICxWTo;d;&jRaXRW`hcH!yJrN<2^Q+e|~ zTK1p$Uv~^_>S%L0@0rW8gS5@4c-^cw)|0)|^Y!2E+7!wWa@^0n-2C>+4$^GI`HE`^$iCW)OD;tU zxFtl%Q7n2^`Jt=1k_2HTUqz-y-XV)r5__yRLas z(iQ#v9`QeY8I<3Y{ao?W?C0x>QdNOBydrJ2p%i)6kvo?-oc#CJ-?w{e(LHkycSL6v z$dnDsU=F;v;1%UIOTIf-lsFmp;F9^Fjq#srq9~^ORgN6rS(Ys4`gBm{M1aoM$d175 z{z1X$MqhDVI z+_k^=kg6zhgJwEBPAE^S%)h>NMpgqWmw)qmThi-&wI_eM-Ryk*OwB}8xBAlJ^QNEQ zeoI(xbFZk_$lJLF%8An;ulHY>o7-1@D9^O07+l}=cRa`g14=Ah_}%7axj@SKfPg2z xcsl)BzohkeY)tE#a!Xa*T-}{B#l^BwpF8HYGHmTAP|KPx+JhdRA&_ Date: Tue, 14 Nov 2023 21:55:49 +0500 Subject: [PATCH 10/14] Button_FIX --- modular_ss220/sm_space_drop/code/sm_button.dm | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 modular_ss220/sm_space_drop/code/sm_button.dm diff --git a/modular_ss220/sm_space_drop/code/sm_button.dm b/modular_ss220/sm_space_drop/code/sm_button.dm deleted file mode 100644 index 95fca3a9b4da..000000000000 --- a/modular_ss220/sm_space_drop/code/sm_button.dm +++ /dev/null @@ -1,41 +0,0 @@ - -////////////////////////////////////// -// СБССМ Кнопки // -////////////////////////////////////// - -/obj/machinery/driver_button/sm_drop_button - name = "\improper кнопка сброса СМ" - desc = "Кнопка для экстренного выбраса СМ в космос" - icon = 'modular_ss220/sm_space_drop/icons/sm_buttons.dmi' - icon_state = "launcherbtt" - anchored = TRUE - armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, rad = 100, fire = 90, acid = 70) - idle_power_consumption = 2 - active_power_consumption = 4 - resistance_flags = LAVA_PROOF | FIRE_PROOF - id_tag = "SpaceDropSM" - req_access = list(ACCESS_CE) - -/obj/machinery/driver_button/sm_drop_button/attack_hand(mob/user) - if(stat & (NOPOWER|BROKEN)) - return - - if(active) - return - - add_fingerprint(user) - - if(!allowed(usr)) - return - - use_power(5) - - for(var/obj/machinery/atmospherics/supermatter_crystal/engine/crystal in SSair.atmos_machinery) - if(crystal.id_tag == id_tag) - crystal.anchored = FALSE - break - - launch_sequence() - -/obj/machinery/driver_button/drop_sm/multitool_act(mob/user, obj/item/I) - return FALSE From 98de5ea6dea933bcc29db763159fcaf373df7688 Mon Sep 17 00:00:00 2001 From: GREEG Date: Tue, 14 Nov 2023 23:41:14 +0500 Subject: [PATCH 11/14] Button_Admin_LOG --- _maps/map_files220/delta/delta.dmm | 1780 ++++++++--------- .../sm_space_drop/code/paper_sm_info.dm | 12 +- .../sm_space_drop/code/sm_button_NEW.dm | 20 +- 3 files changed, 903 insertions(+), 909 deletions(-) diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index fc5eaca631a8..381a2fb61a7c 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -4633,8 +4633,17 @@ }, /area/station/engineering/controlroom) "axW" = ( -/obj/effect/turf_decal/caution/stand_clear, -/turf/simulated/floor/engine, +/obj/item/kirbyplants, +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axY" = ( /obj/structure/grille, @@ -5204,19 +5213,13 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "aAd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/machinery/power/rad_collector, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "aAe" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -6815,22 +6818,12 @@ /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "aHG" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 }, -/obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "aHI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -7116,6 +7109,9 @@ /obj/machinery/power/smes{ charge = 1e+006 }, +/obj/structure/sign/electricshock{ + pixel_y = 32 + }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -7123,6 +7119,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIB" = ( +/obj/item/kirbyplants, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -7147,9 +7144,11 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) +"aIH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -7157,15 +7156,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"aIH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) "aIQ" = ( /obj/machinery/economy/vending/janidrobe, /turf/simulated/floor/plasteel{ @@ -7338,19 +7328,12 @@ /turf/space, /area/space/nearstation) "aJD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/item/kirbyplants, +/obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, -/obj/machinery/power/rad_collector, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "aJE" = ( /obj/machinery/conveyor/south{ id = "QMLoad2" @@ -7358,17 +7341,12 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "aJF" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, +/obj/item/kirbyplants, /obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, +/turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aJG" = ( /obj/structure/table/reinforced, @@ -7382,22 +7360,14 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aJH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + icon_state = "neutralfull" }, /area/station/engineering/controlroom) "aJI" = ( @@ -7473,14 +7443,14 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aJU" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id_tag = "engsm" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/sign/nosmoking_2{ + pixel_y = 32 }, -/turf/simulated/floor/plating, -/area/station/engineering/engine/supermatter) +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/maintenance/turbine) "aJV" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -8012,23 +7982,10 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/turbine) "aMK" = ( +/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular{ - pixel_y = 2 - }, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/maintenance/turbine) "aML" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -9200,13 +9157,21 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "aSH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, -/area/station/engineering/controlroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "aSI" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -20289,15 +20254,34 @@ /area/station/command/office/ce) "bMi" = ( /obj/structure/table/reinforced, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen/multi, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -7 + }, +/obj/item/pen/multi{ + pixel_y = 10; + pixel_x = -7 + }, +/obj/item/stamp/ce{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/folder/blue{ + pixel_x = 7; + pixel_y = -2 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, /area/station/command/office/ce) "bMj" = ( /obj/structure/table/reinforced, -/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/paper/tcommskey{ + pixel_x = 7 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -21425,9 +21409,6 @@ /area/station/supply/office) "bQd" = ( /obj/structure/table/reinforced, -/obj/item/folder/blue, -/obj/item/stamp/ce, -/obj/item/paper/tcommskey, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -21445,6 +21426,9 @@ pixel_x = -5; req_access_txt = "56" }, +/obj/item/paper/sm_paper{ + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -29512,16 +29496,17 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -45826,9 +45811,9 @@ /turf/simulated/floor/carpet, /area/station/service/chapel/office) "dYV" = ( +/obj/structure/rack, +/obj/item/storage/secure/briefcase, /obj/machinery/newscaster/directional/south, -/obj/structure/table/reinforced, -/obj/item/paper/sm_paper, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "dYX" = ( @@ -47739,24 +47724,17 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "eFV" = ( -/obj/machinery/camera{ - c_tag = "Supermatter South"; - network = list("SS13","Engineering") - }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/structure/cable/yellow{ - d1 = 4; +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/alarm/engine{ - pixel_y = 24 + icon_state = "2-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/engine/supermatter) +/area/station/engineering/controlroom) "eFX" = ( /obj/structure/chair/sofa/right{ color = "#A30FAF"; @@ -49105,10 +49083,21 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "fhC" = ( -/obj/structure/rack, -/obj/item/storage/secure/briefcase, -/turf/simulated/floor/plasteel/dark, -/area/station/command/office/ce) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/station/engineering/controlroom) "fhF" = ( /turf/space, /area/shuttle/gamma/station) @@ -52950,9 +52939,11 @@ }, /area/station/security/prison/cell_block/A) "gwO" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Supermatter South"; + network = list("SS13","Engineering") }, +/obj/machinery/atmospherics/pipe/manifold/visible, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52961,15 +52952,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/power/apc/super/north, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/alarm/engine{ + pixel_y = 24 }, /obj/structure/cable/yellow{ d1 = 2; @@ -53165,6 +53149,22 @@ icon_state = "darkblue" }, /area/station/medical/morgue) +"gBo" = ( +/obj/item/kirbyplants, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "gBF" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/welding/flamedecal/blue{ @@ -58741,14 +58741,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) -"itK" = ( -/obj/machinery/atmospherics/binary/valve/digital, -/obj/machinery/driver_button/sm_drop_button{ - pixel_x = 32; - range = 20 - }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) "itL" = ( /obj/structure/cable{ d1 = 4; @@ -60474,12 +60466,12 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "iZL" = ( +/obj/effect/turf_decal/stripes/corner, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "iZR" = ( @@ -60883,17 +60875,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/warden) "jhz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, /obj/structure/window/plasmareinforced{ dir = 8 }, -/obj/machinery/power/rad_collector, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "jhD" = ( @@ -60910,10 +60897,19 @@ }, /area/station/security/brig) "jhG" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "jhH" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -64644,17 +64640,18 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "kur" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, +/obj/item/kirbyplants, +/obj/effect/turf_decal/delivery/hollow, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/table/reinforced, -/obj/item/rpd, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "kut" = ( @@ -69661,12 +69658,6 @@ }, /area/station/public/toilet) "mgh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, /obj/machinery/power/rad_collector, /obj/structure/cable/yellow{ d2 = 8; @@ -70591,25 +70582,13 @@ }, /area/station/security/brig) "mxG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/atmospherics/binary/valve/digital, +/obj/machinery/driver_button/sm_drop_button{ + range = 20; + pixel_x = 32 }, -/area/station/engineering/atmos) +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "myf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71903,21 +71882,14 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "mZv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/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{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/turf_decal/stripes/corner, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/controlroom) "mZR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -74913,11 +74885,10 @@ /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "nUR" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/effect/turf_decal/arrows{ + dir = 1 }, -/turf/space, +/turf/simulated/floor/engine, /area/station/engineering/controlroom) "nVf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -75217,11 +75188,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "oav" = ( @@ -75371,12 +75337,11 @@ }, /area/station/security/permabrig) "ocA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel/dark, -/area/station/engineering/atmos) +/obj/structure/closet/radiation, +/obj/effect/turf_decal/delivery/hollow, +/obj/item/clothing/glasses/meson, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "ocJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -75472,6 +75437,20 @@ }, /turf/simulated/floor/plating, /area/station/science/robotics/showroom) +"oeZ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "off" = ( /turf/simulated/floor/plasteel{ icon_state = "red" @@ -76936,10 +76915,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "oHg" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/structure/window/plasmareinforced{ + dir = 8 }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) @@ -77601,15 +77581,24 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "oVs" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/power/apc/super/north, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/engineering/engine/supermatter) "oVE" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -79394,6 +79383,15 @@ /obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/maintenance/incinerator) +"pyQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/structure/window/plasmareinforced{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "pzB" = ( /obj/machinery/firealarm/directional/north{ pixel_x = 5 @@ -80016,13 +80014,12 @@ /turf/simulated/floor/plating, /area/station/science/robotics/showroom) "pJw" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id_tag = "engsm" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/power/rad_collector, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "pJP" = ( /obj/machinery/light/small/directional/south, @@ -80537,12 +80534,17 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "pSJ" = ( -/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/camera{ + c_tag = "Supermatter East"; + dir = 8; + network = list("Engineering","SS13") + }, /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -81042,9 +81044,15 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "qdk" = ( -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/reagent_dispensers/watertank, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "qdm" = ( @@ -87615,20 +87623,14 @@ }, /area/station/service/kitchen) "sqD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/structure/window/plasmareinforced{ + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/turf/simulated/floor/engine, +/area/station/engineering/engine/supermatter) "sqF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -91009,19 +91011,12 @@ }, /area/station/medical/surgery/secondary) "tzp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/obj/machinery/power/rad_collector, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/engine, -/area/station/engineering/engine/supermatter) +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/closet/radiation, +/obj/effect/turf_decal/delivery/hollow, +/obj/item/clothing/glasses/meson, +/turf/simulated/floor/plasteel, +/area/station/engineering/controlroom) "tzq" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -94686,14 +94681,11 @@ }, /area/station/service/expedition) "uNZ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/maintenance/turbine) "uOa" = ( /obj/item/chair/light, /obj/effect/decal/cleanable/dirt, @@ -98379,17 +98371,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) "waQ" = ( -/obj/machinery/camera{ - c_tag = "Supermatter East"; - dir = 8; - network = list("Engineering","SS13") - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "waT" = ( @@ -100398,7 +100386,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + icon_state = "yellowfull" }, /area/station/engineering/controlroom) "wQG" = ( @@ -123907,19 +123895,19 @@ aaa aaa aaa dij -aaa -aaa +dij +dij +dij +dij +dij +dij +dij +dij +abj abj -aaa abj -aaa -aaa abj aaa -aaa -aaa -aaa -acF leZ aIt aMO @@ -124165,18 +124153,18 @@ aaa aaa aaa aaa -dij -abj -abj -abj -abj -abj -abj -abj aaa abj +aaa abj +aaa +aaa abj +aaa +aaa +aaa +aaa +acF aHa aIu aJN @@ -124421,19 +124409,19 @@ aaa aaa aaa aaa +aaa +dij +abj +abj +abj +abj abj abj abj aaa -aAe -aBV -aAe -aBV -aAe -aBV -aAe -aJy -aBV +abj +abj +abj leZ aIv aJO @@ -124678,19 +124666,19 @@ aaa aaa aaa aaa -dij abj abj abj -aAi -ayG -azR -ayG -aAi -ayG -azR -aIT -aEa +aaa +aAe +aBV +aAe +aBV +aAe +aBV +aAe +aJy +aBV leZ aIw aJO @@ -124938,16 +124926,16 @@ aaa dij abj abj -aaa -aAi -aAi -aAi -aAi -aAi +abj aAi +ayG +azR +ayG aAi -aDC -aBV +ayG +azR +aIT +aEa leZ aIx aJO @@ -125195,16 +125183,16 @@ aaa dij abj abj -abj +aaa aAi -ayG -ayG -ayG aAi -ayG -ayG -aIT -aEa +aAi +aAi +aAi +aAi +aAi +aDC +aBV aHa aIy gJL @@ -125212,7 +125200,7 @@ pNz mPY jmi xqG -kaq +aQT aSA aTW aVD @@ -125449,149 +125437,149 @@ aaa aaa aaa aaa -abj -abj -abj -abj -aAi -aDC -aEa -aDC -aEa -aDC -aEa -aDC -aBV -aHa -aIz -aJR -hgs -hxO -aOb -nPe -brz -pxC -hEc -aVE -aXi -aYy -aYy -aYy -bdo -aYy -aYy -aYy -bdo -bkz -bmv -aUi -bpA -brB -aTZ -ban -bvF -bwP -bzO -bzN -bBy -bDo -bER -bGz -nVq -bKf -bMj -bQd -nWx -bRX -bUj -jXC -bXU -bXU -jkM -bXU -cdc -abj -cif -cda -cgG -cgG -cgG -cpj -cgG -cgG -cgG -cda -cif -abj -cCf -bXU -wou -bXU -bXU -jUu -dhG -cIC -cJW -cLJ -cNe -ldQ -cQA -cRI -fOy -cIx -rQp -dhG -irt -daj -hvs -dmM -mAs -dfN -yeh -dfN -dcX -dcX -sph -lTi -dYy -drd -lTi -hsa -irt -abj -acF -aaa -aaa -abj -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dij +abj +abj +abj +aAi +ayG +ayG +ayG +aAi +ayG +ayG +aIT +aEa +aHa +aIz +aJR +hgs +hxO +aOb +aQT +kaq +pxC +hEc +aVE +aXi +aYy +aYy +aYy +bdo +aYy +aYy +aYy +bdo +bkz +bmv +aUi +bpA +brB +aTZ +ban +bvF +bwP +bzO +bzN +bBy +bDo +bER +bGz +nVq +bKf +bMj +bQd +nWx +bRX +bUj +jXC +bXU +bXU +jkM +bXU +cdc +abj +cif +cda +cgG +cgG +cgG +cpj +cgG +cgG +cgG +cda +cif +abj +cCf +bXU +wou +bXU +bXU +jUu +dhG +cIC +cJW +cLJ +cNe +ldQ +cQA +cRI +fOy +cIx +rQp +dhG +irt +daj +hvs +dmM +mAs +dfN +yeh +dfN +dcX +dcX +sph +lTi +dYy +drd +lTi +hsa +irt +abj +acF +aaa +aaa +abj +aaa +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -125701,32 +125689,32 @@ aaa aaa aaa aaa -dij -dij +aaa +aaa +aaa +aaa abj -dij -dij abj -atd -atd -eKj -aCd -eKj -eKj -atd -atd -eKj -eKj -eKj -aCd -atd +abj +abj +abj +aAi +aDC +aEa +aDC +aEa +aDC +aEa +aDC +aBV +leZ aIA aJR hLA pih izz -kXZ -aQW +nPe +brz aSD ePS aVF @@ -125958,32 +125946,32 @@ aaa aaa aaa aaa +dij +dij abj -aaa -abj -aaa -abj +dij +dij abj atd -avx -uQW -ePt -aMK -aHG -wwE -kuJ -vJN -xiD -rAC -gba -aGd +atd +eKj +aCd +eKj +eKj +atd +atd +eKj +eKj +eKj +aCd +atd leZ aJS hgs jhJ -aOg -aPy -aQT +aOb +kXZ +aQW aSE gsz aVG @@ -126018,7 +126006,7 @@ bOe bUl bRZ bUl -fhC +bIq bXU fEo cbi @@ -126214,32 +126202,32 @@ aaa aaa aaa aaa -dij +aaa +abj +aaa +abj +aaa abj abj atd -pAQ -tEe -mPO -atd -aIH -aFd -axI -aFd -ayT -aCi -aCi -aDe -aFd -aFd -sQZ -aIB -leZ +avx +uQW +ePt +kur +kur +wwE +kuJ +vJN +xiD +rAC +gba +aGd leZ -vHD -aMJ +aJU +uNZ +aMK aOg -aPz +aPy aQT wpy bMF @@ -126473,30 +126461,30 @@ aaa aaa dij abj +abj atd +pAQ +tEe +mPO atd -qWG -tCX -hGx -axl -avI -awI -axK -ayJ -azU -ayR -aAg -aCV -aEd -ayR -iyC +aLs +aFd +axI +aFd +ayT +aCi +aCi +aDe +aFd +aFd +sQZ aJF leZ -lZR -aLs -aML +leZ +vHD +aMJ aOg -aQZ +aPz aQT aSD uQB @@ -126728,33 +126716,33 @@ aaa aaa aaa aaa -raB -aaa -eKj -ndW -pJf -rwj -pJf +dij +abj +atd +atd +qWG +tCX +hGx axl avI -oql -axJ -aCp -ayV -aHc -aCS -aDh -aFl -aHc -uly +awI +axK +ayJ +azU +ayR +aAg +aCV +aEd +ayR +iyC aJH aIB -kAG -aLu -aMM -aOj -aUM -ocA +lZR +aLs +aML +aOg +aQZ +aQT aSD oQJ aVI @@ -126987,31 +126975,31 @@ aaa aaa raB aaa -uUh -lWo -nIM -qEN +eKj +ndW +pJf +rwj pJf axl avI -iVF -axL -ayL -azT -aJU -azT -ayP -aCj -aDf -aFe -aHh +oql +axJ +aCp +ayV +aCS +aCS +aDh +aFl +aHc +uly +fhC aID -aCk -jhG -qdk -aOg -mMM -aQT +kAG +aLu +aMM +aOj +aUM +aHG aSD qYd aVJ @@ -127242,32 +127230,32 @@ aaa aaa aaa aaa -dij +raB aaa -ths -kaO +uUh +lWo +nIM +qEN pJf -uoQ -dFi -auG -avC -fCZ -axM -ayM -oHg -aAa -oHg -raH +axl +avI +iVF +axL +ayL +azT +azT +azT +ayP aCj -aEf -aFf -aHl +aDf +aFe +aHh aID -atd -aLp -atd +aCk +ocA +tzp aOg -aPC +mMM aQT aSD qYd @@ -127500,31 +127488,31 @@ aaa aaa aaa dij -abj -atd -atd -ufU -iWM +aaa +ths +kaO pJf -sdI -aLu -qhe -axO -ayO -aJD -aik -mgh -ksd +uoQ +dFi +auG +avC +fCZ +axM ayM -aFg -wBz -aHh +mgh +mgh +mgh +raH +aCj +aEf +aFf +aHl aIE atd -wgY -eMw +aLp +atd aOg -noD +aPC aQT aSD qYd @@ -127757,31 +127745,31 @@ aaa aaa aaa dij -aaa -eKj -pJf -pJf -rwj +abj +atd +atd +ufU +iWM pJf -vOo -avE -eiU -axP +sdI +aLu +qhe +axO +ayO +pyQ +aik +sqD +ksd ayM -azZ -azZ -azZ -gLW -upc -pcM -aJs -aHl +aFg +wBz +aHh aIF -aJV -lSE -xCp -gML -ihk +atd +wgY +eMw +aOg +noD aQT aSD qYd @@ -128013,35 +128001,35 @@ aaa aaa aaa aaa -raB +dij aaa -onA -axW -qdE -oKV -pOi -lqL -fjw -lNO -nUm -kJd -aAa -aBX -aAa -mxm -aAa -aCZ -rZo -aGi +eKj +pJf +pJf +rwj +pJf +vOo +avE +eiU +axP +ayM +azZ +azZ +azZ +gLW +upc +pcM +aJs +aHl aIG -aJZ -glw -sfh -aOm -aTT -aAd -mZv -mxG +aJV +lSE +xCp +gML +ihk +aQT +aSD +qYd aVL aXo aXo @@ -128270,34 +128258,34 @@ aaa aaa aaa aaa -dij +raB aaa -ths -pJf -pJf -rwj -pJf -uJs -awP -fzx -axR -ayM -aAb -aAb -aAb -duJ -itK -pcM -eFV -aHl -aID -lZR -stW -hiq -aOk -aQZ -aQT -aSD +onA +nUR +qdE +oKV +pOi +lqL +fjw +lNO +nUm +kJd +aAa +aBX +aAa +mxm +aAa +aCZ +rZo +aGi +aIH +aJZ +glw +sfh +aOm +aTT +jhG +aSH cwX aVI aXq @@ -128528,31 +128516,31 @@ aaa aaa aaa dij -abj -atd -atd -kqp -gWk +aaa +ths pJf -dFZ -iqR -hwu -axS -ayO -jhz -qEB -tzp -nDt -ayM +pJf +rwj +pJf +uJs +awP +fzx +axR ayM +aAb +aAb +aAb +duJ +mxG +pcM gwO wQE iZL -atd -jMo -rbo -aOg -aPG +lZR +stW +hiq +aOk +aQZ aQT aSD aUe @@ -128784,32 +128772,32 @@ aaa aaa aaa aaa -raB -aaa -eKj -tUw +dij +abj +atd +atd +kqp +gWk pJf -rwj -dFi -auG -dWj -hZW -axN -ayM -oHg -aAa +dFZ +iqR +hwu +axS +ayO oHg -raH -aDc -aEj -aGa -aHl +qEB +jhz +nDt +ayM +ayM +oVs +aHh eEd atd -atd -atd +jMo +rbo aOg -dVX +aPG aQT aSD aTZ @@ -129041,32 +129029,32 @@ aaa aaa aaa aaa -dij +raB aaa -uBp -lWo -vKK -bnK +eKj +tUw pJf -axl -che -cJs -axL -ayP -aBf +rwj +dFi +auG +dWj +hZW +axN +ayM +aAd pJw -aBf -ayL +aAd +raH aDc aEj -aFi -aHm +aGa +aHl oan -aJY -aLv -kNF +atd +atd +atd aOg -sQf +dVX aQT aSD aTZ @@ -129300,30 +129288,30 @@ aaa aaa dij aaa -ths -tQK -pJf -rwj +uBp +lWo +vKK +bnK pJf axl che -uMY -nbG -ayI -azV -aFV -aCU -aEe -aFV -aFV -dEE -hox -tep -oox -aLw -pJP +cJs +axL +ayP +aBf +aBf +aBf +ayL +aDc +aEj +aFi +aHm +oeZ +aJY +aLv +kNF aOg -vRU +sQf aQT aSJ aUf @@ -129556,31 +129544,31 @@ aaa aaa aaa dij -abj -atd -atd -uYk -tYw -wqp +aaa +ths +tQK +pJf +rwj +pJf axl che -pYc -axV -ayR -aAg -ayR -aAg -aDd -aEm -aFj -rfH -aSH -aID -kzE -nRx -oHK +uMY +nbG +ayI +azV +aCU +aCU +aEe +aFV +aFV +dEE +hox +tep +oox +aLw +pJP aOg -aQZ +vRU aQT aSK aUg @@ -129814,30 +129802,30 @@ aaa aaa dij abj -aaa atd -pAQ -jqX -mPO atd -rfT -aCW -bai -ayK -azW -aCW -aCW -aEl -ygd -exZ -aHp -aCW +uYk +tYw +wqp +axl +che +pYc +axV +ayR +aAg +ayR +aAg +aDd +aEm +aFj +rfH +mZv aMM -auK -qaS -aes -aOl -aPH +kzE +nRx +oHK +aOg +aQZ aQT aSL aUh @@ -130069,31 +130057,31 @@ aaa aaa aaa aaa -aaa -abj -abj -abj -abj +dij abj aaa atd -pSJ -oVs -kur -hEn -sqD -uNZ -waQ -fpf -qOQ -vHB -aGc -aJG -gBF -atd -atd +pAQ +jqX +mPO atd -aOg +rfT +aCW +bai +ayK +azW +aCW +aCW +aEl +ygd +exZ +aHp +aJD +gBF +auK +qaS +aes +aOl aOg vMy aOg @@ -130327,30 +130315,30 @@ aaa aaa aaa aaa -fOs -fOs abj abj abj abj +abj +aaa atd +eFV +qdk +axW +hEn +gBo +waQ +pSJ +fpf +qOQ +vHB +aGc +aJG atd atd atd -dLX -dLX -atd -aCk -iGI -ths -ths -atd -atd atd atd -aaa -aaa -aaa abj inh wRk @@ -130584,26 +130572,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -nUR -nUR -aaa -aaa -aOW -aaa -aaa -aaa -aaa -aaa +fOs +fOs +abj +abj +abj +abj +atd +atd +atd +atd +dLX +dLX +atd +aCk +iGI +ths +ths +atd +atd +atd aaa abj biW diff --git a/modular_ss220/sm_space_drop/code/paper_sm_info.dm b/modular_ss220/sm_space_drop/code/paper_sm_info.dm index 360b8f233459..0208af6f2200 100644 --- a/modular_ss220/sm_space_drop/code/paper_sm_info.dm +++ b/modular_ss220/sm_space_drop/code/paper_sm_info.dm @@ -7,17 +7,17 @@ info = {"

Инструкция по использованию Системы Быстрого Сброса Кристала Суперматерии


1. Ни при каких обстоятельствах не нажимать на кнопку ради проверки ее работоспособности.
-
2. Решение о сбросе кристала может принимать СЕ или его ВРиО и выше.
+
2. Решение о сбросе кристала может принимать СЕ, или его ВРиО и выше.
-
3. Если целостность кристала равна 10 или мение процентов, должне быть произведен сброс кристала в кратчайшее время.
+
3. Если целостность кристала равна 10 или мение процентов, должен быть произведен сброс кристала в кратчайшее время.
-
4. В случае отсутствия СЕ и до назначения его ВРиО решение о сбросе кристала принимает Капитан.
+
4. В случае отсутствия СЕ и до назначения его ВРиО, решение о сбросе кристала принимает капитан.
-
5. Создание помехи при неообходимости сброса кристала квалифицируется статьей 400 космического закона.
+
5. Создание помехи при неообходимости сброса кристала квалифицируется статьей 400 Космического Закона.
-
Поздравляю! Теперь в случае вероятности взрыва кристала супер материи вы в состоянии сохранить целостность станции.
+
Поздравляю! Теперь в случае вероятности взрыва кристала Супер Материи, вы в состоянии сохранить целостность станции.
-
ПРИМЕЧАНИЕ Кнопка сброса СМ находится в его буферной зоне на стене возле правого вента.
+
ПРИМЕЧАНИЕ: Кнопка сброса СМ находится в его буферной зоне на стене возле правого вента.

"} diff --git a/modular_ss220/sm_space_drop/code/sm_button_NEW.dm b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm index dc0284f3523f..52fe4ccb756d 100644 --- a/modular_ss220/sm_space_drop/code/sm_button_NEW.dm +++ b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm @@ -4,7 +4,7 @@ ////////////////////////////////////// /obj/machinery/driver_button/sm_drop_button - name = "\improper экстренный сброс СМ" + name = "supermatter launch trigger" desc = "ВНИМАНИЕ:Сброс кристала суперматерии. Неправомерное использование может привести к тюремному заключению." icon = 'modular_ss220/sm_space_drop/icons/sm_buttons.dmi' icon_state = "button" @@ -51,26 +51,32 @@ // Already launched if(launched) - to_chat(user, "Кнопку уже нажали, процесс выброса СМ запущен.") + to_chat(user, "Кнопку уже нажали.") // Glass present else if(glass) if(user.a_intent == INTENT_HARM) - user.custom_emote(EMOTE_VISIBLE, "Разбивает стекло кнопки [src]!") + user.custom_emote(EMOTE_VISIBLE, "разбивает стекло[src.name]!") glass = FALSE playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) update_icon() else - user.custom_emote(EMOTE_VISIBLE, "Хлопает по стеклу кнопки [src].") - to_chat(user, "Если вы пытаетесь разбить стекло, вам придется ударить по нему сильнее...") + user.custom_emote(EMOTE_VISIBLE, "дружески похлопывает по [src.name].") + to_chat(user, "Если вы пытаетесь разбить стекло, вам придется ударить по нему сильнее...") // Must be !glass and !launched else - user.custom_emote(EMOTE_VISIBLE, "Нажиамает кнопку сброса [src]!") - visible_message("Кнопка громко щелкает.") + user.custom_emote(EMOTE_VISIBLE, "нажемает кнопку сброса [src.name]!") + visible_message("Кнопка громко щелкает.") launch_sequence() playsound(src, pick('modular_ss220/sm_space_drop/sound/button.ogg','modular_ss220/sm_space_drop/sound/button1.ogg','modular_ss220/sm_space_drop/sound/button2.ogg','modular_ss220/sm_space_drop/sound/button3.ogg','modular_ss220/sm_space_drop/sound/button4.ogg'), 100, 1) update_icon() + if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) + var/area/area = get_area(src) + if(area) + message_admins("Supermatter crystal reset activated([area.name])") + log_game("Supermatter crystal reset activated([area.name])") + investigate_log("delete at ([area.name])","SM") /obj/machinery/driver_button/sm_drop_button/launch_sequence() if(launched) From c506f6f5589ba8136178e5847af3c5d5ed335138 Mon Sep 17 00:00:00 2001 From: GREEG Date: Wed, 15 Nov 2023 00:55:20 +0500 Subject: [PATCH 12/14] Macro_Fix --- modular_ss220/sm_space_drop/code/sm_button_NEW.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modular_ss220/sm_space_drop/code/sm_button_NEW.dm b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm index 52fe4ccb756d..c2410ca91cbc 100644 --- a/modular_ss220/sm_space_drop/code/sm_button_NEW.dm +++ b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm @@ -56,17 +56,17 @@ // Glass present else if(glass) if(user.a_intent == INTENT_HARM) - user.custom_emote(EMOTE_VISIBLE, "разбивает стекло[src.name]!") + user.custom_emote(EMOTE_VISIBLE, "разбивает стекло [src.name]!") glass = FALSE playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) update_icon() else user.custom_emote(EMOTE_VISIBLE, "дружески похлопывает по [src.name].") - to_chat(user, "Если вы пытаетесь разбить стекло, вам придется ударить по нему сильнее...") + to_chat(user, span_warning("Если вы пытаетесь разбить стекло, вам придется ударить по нему сильнее...")) // Must be !glass and !launched else - user.custom_emote(EMOTE_VISIBLE, "нажемает кнопку сброса [src.name]!") - visible_message("Кнопка громко щелкает.") + user.custom_emote(EMOTE_VISIBLE, "нажимает кнопку сброса [src.name]!") + visible_message(span_notice("Кнопка громко щелкает.")) launch_sequence() playsound(src, pick('modular_ss220/sm_space_drop/sound/button.ogg','modular_ss220/sm_space_drop/sound/button1.ogg','modular_ss220/sm_space_drop/sound/button2.ogg','modular_ss220/sm_space_drop/sound/button3.ogg','modular_ss220/sm_space_drop/sound/button4.ogg'), 100, 1) update_icon() @@ -76,7 +76,7 @@ if(area) message_admins("Supermatter crystal reset activated([area.name])") log_game("Supermatter crystal reset activated([area.name])") - investigate_log("delete at ([area.name])","SM") + investigate_log("active at ([area.name])","supermatter") /obj/machinery/driver_button/sm_drop_button/launch_sequence() if(launched) From dc52ff8602a9959849407a07bd80e12bf4db437b Mon Sep 17 00:00:00 2001 From: GREEG Date: Wed, 15 Nov 2023 01:09:55 +0500 Subject: [PATCH 13/14] Mini_Fix --- modular_ss220/sm_space_drop/code/paper_sm_info.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modular_ss220/sm_space_drop/code/paper_sm_info.dm b/modular_ss220/sm_space_drop/code/paper_sm_info.dm index 0208af6f2200..b6be2c66c2f5 100644 --- a/modular_ss220/sm_space_drop/code/paper_sm_info.dm +++ b/modular_ss220/sm_space_drop/code/paper_sm_info.dm @@ -4,18 +4,18 @@ name = "\improper инструкция по использованию СБСКС" icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper" - info = {"

Инструкция по использованию Системы Быстрого Сброса Кристала Суперматерии

+ info = {"

Инструкция по использованию Системы Быстрого Сброса Кристалла Суперматерии


1. Ни при каких обстоятельствах не нажимать на кнопку ради проверки ее работоспособности.
-
2. Решение о сбросе кристала может принимать СЕ, или его ВРиО и выше.
+
2. Решение о сбросе кристалла может принимать СЕ, или его ВРиО и выше.
-
3. Если целостность кристала равна 10 или мение процентов, должен быть произведен сброс кристала в кратчайшее время.
+
3. Если целостность кристалла равна 10 или менее процентов, должен быть произведен сброс кристалла в кратчайшее время.
-
4. В случае отсутствия СЕ и до назначения его ВРиО, решение о сбросе кристала принимает капитан.
+
4. В случае отсутствия СЕ и до назначения его ВРиО, решение о сбросе кристалла принимает капитан.
-
5. Создание помехи при неообходимости сброса кристала квалифицируется статьей 400 Космического Закона.
+
5. Создание помехи при необходимости сброса кристалла квалифицируется статьей 400 Космического Закона.
-
Поздравляю! Теперь в случае вероятности взрыва кристала Супер Материи, вы в состоянии сохранить целостность станции.
+
Поздравляю! Теперь в случае вероятности взрыва кристалла Супер Материи, вы в состоянии сохранить целостность станции.

ПРИМЕЧАНИЕ: Кнопка сброса СМ находится в его буферной зоне на стене возле правого вента.
From d17b1e1c1f5aa5240381ba2d557bd3ef9bdd4169 Mon Sep 17 00:00:00 2001 From: GREEG Date: Wed, 15 Nov 2023 01:19:36 +0500 Subject: [PATCH 14/14] Fix-Button --- modular_ss220/sm_space_drop/code/sm_button_NEW.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modular_ss220/sm_space_drop/code/sm_button_NEW.dm b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm index c2410ca91cbc..5440f3a5eee1 100644 --- a/modular_ss220/sm_space_drop/code/sm_button_NEW.dm +++ b/modular_ss220/sm_space_drop/code/sm_button_NEW.dm @@ -51,7 +51,7 @@ // Already launched if(launched) - to_chat(user, "Кнопку уже нажали.") + to_chat(user, span_warning("Кнопку уже нажали")) // Glass present else if(glass) @@ -74,9 +74,8 @@ if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) var/area/area = get_area(src) if(area) - message_admins("Supermatter crystal reset activated([area.name])") - log_game("Supermatter crystal reset activated([area.name])") - investigate_log("active at ([area.name])","supermatter") + message_admins("Supermatter Crystal has been launched to space by [key_name_admin(user)] [ADMIN_JMP(src)].") + investigate_log("has been launched to space at ([area.name]) by [key_name(user)].","supermatter") /obj/machinery/driver_button/sm_drop_button/launch_sequence() if(launched)