diff --git a/maps/victory/levels/deck1.dmm b/maps/victory/levels/deck1.dmm index 722954ffacfe..9764cdf3dd7b 100644 --- a/maps/victory/levels/deck1.dmm +++ b/maps/victory/levels/deck1.dmm @@ -3943,6 +3943,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"oq" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled, +/area/space) "or" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -6655,6 +6659,29 @@ /obj/structure/dispenser/phoron, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) +"ym" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/space) +"yn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) "yq" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -27272,9 +27299,9 @@ he he he he -he -he -he +ym +yn +oq he he he @@ -27466,9 +27493,9 @@ he he he he -he -he -he +ym +yn +oq he he he @@ -27660,6 +27687,9 @@ he he he he +ym +yn +oq he he he @@ -27671,12 +27701,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -27854,6 +27881,9 @@ he he he he +ym +yn +oq he he he @@ -27865,12 +27895,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -28048,6 +28075,9 @@ he he he he +ym +yn +oq he he he @@ -28059,12 +28089,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -28242,6 +28269,9 @@ YN Ll dN he +ym +yn +oq he he he @@ -28253,12 +28283,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -28436,6 +28463,9 @@ LQ hx dN he +ym +yn +oq he he he @@ -28447,12 +28477,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -28630,6 +28657,9 @@ Zr VA Va he +ym +yn +oq he he he @@ -28641,12 +28671,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -28824,6 +28851,9 @@ Xr DK lt he +ym +yn +oq he he he @@ -28835,12 +28865,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he xe @@ -29018,6 +29045,9 @@ Du Tv dN he +ym +yn +oq he he he @@ -29029,12 +29059,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -29212,6 +29239,9 @@ hx WH dN he +ym +yn +oq he he he @@ -29223,12 +29253,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Tu @@ -29406,6 +29433,9 @@ hx WH dN he +ym +yn +oq he he he @@ -29417,12 +29447,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he xv @@ -29600,6 +29627,9 @@ dN dN dN he +ym +yn +oq he he he @@ -29611,12 +29641,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he xv @@ -29794,6 +29821,9 @@ On cn dN he +ym +yn +oq he he he @@ -29805,12 +29835,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he xv @@ -29988,6 +30015,9 @@ hx KY dN he +ym +yn +oq he he he @@ -29999,12 +30029,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he xv @@ -30182,6 +30209,9 @@ hx LS dN he +ym +yn +oq he he he @@ -30193,12 +30223,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he xv @@ -30376,6 +30403,9 @@ hx Fx dN he +ym +yn +oq he he he @@ -30387,12 +30417,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he @@ -30570,6 +30597,9 @@ hx KG dN he +ym +yn +oq he he he @@ -30581,12 +30611,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he @@ -30764,6 +30791,9 @@ Hk Pi dN he +ym +yn +oq he he he @@ -30775,12 +30805,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he @@ -30958,6 +30985,9 @@ wc Iw dN he +ym +yn +oq he he he @@ -30969,12 +30999,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he @@ -31152,6 +31179,9 @@ hx RR dN he +ym +yn +oq he he he @@ -31163,12 +31193,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he @@ -31346,6 +31373,9 @@ UL Xa dN he +ym +yn +oq he he he @@ -31357,12 +31387,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he @@ -31540,9 +31567,9 @@ dN dN dN he -he -he -he +ym +yn +oq he he he @@ -31554,9 +31581,9 @@ Fw Fw he he -he -he -he +ym +yn +oq he he he @@ -31734,9 +31761,9 @@ he he he he -he -he -he +ym +yn +oq he he he @@ -31748,9 +31775,9 @@ RV Fw he he -he -he -he +ym +yn +oq he he he @@ -31928,9 +31955,9 @@ he he he he -he -he -he +ym +yn +oq he he he @@ -31942,9 +31969,9 @@ qA Fw he he -he -he -he +ym +yn +oq he he Uw @@ -32122,9 +32149,9 @@ dN dN dN he -he -he -he +ym +yn +oq he he he @@ -32136,9 +32163,9 @@ vL Fw he he -he -he -he +ym +yn +oq he he Uw @@ -32316,9 +32343,9 @@ tF Yb dN he -he -he -he +ym +yn +oq he he he @@ -32330,9 +32357,9 @@ Fw Fw he he -he -he -he +ym +yn +oq he he Uw @@ -32510,6 +32537,9 @@ nE lL dN he +ym +yn +oq he he he @@ -32521,12 +32551,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -32704,6 +32731,9 @@ rR qe br he +ym +yn +oq he he he @@ -32715,12 +32745,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -32898,6 +32925,9 @@ pt Yj br he +ym +yn +oq he he he @@ -32909,12 +32939,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -33092,6 +33119,9 @@ nE oY br he +ym +yn +oq he he he @@ -33103,12 +33133,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -33286,6 +33313,9 @@ ws me br he +ym +yn +oq he he he @@ -33297,12 +33327,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -33480,6 +33507,9 @@ Lx Ar yR he +ym +yn +oq he he he @@ -33491,12 +33521,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he sE @@ -33674,6 +33701,9 @@ Ov aa br he +ym +yn +oq he he he @@ -33685,12 +33715,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Mh @@ -33868,6 +33895,9 @@ yJ yJ yJ he +ym +yn +oq he he he @@ -33879,12 +33909,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he sE @@ -34062,6 +34089,9 @@ py Gv yJ he +ym +yn +oq he he he @@ -34073,12 +34103,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -34256,6 +34283,9 @@ oz mv Lz he +ym +yn +oq he he he @@ -34267,12 +34297,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -34450,6 +34477,9 @@ RI jJ du he +ym +yn +oq he he he @@ -34461,12 +34491,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -34644,6 +34671,9 @@ ad XP gi he +ym +yn +oq he he he @@ -34655,12 +34685,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -34838,6 +34865,9 @@ Uj Nb yJ he +ym +yn +oq he he he @@ -34849,12 +34879,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -35032,6 +35059,9 @@ Ek aM yJ he +ym +yn +oq he he he @@ -35043,12 +35073,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he Uw @@ -35226,6 +35253,9 @@ yJ yJ yJ he +ym +yn +oq he he he @@ -35237,12 +35267,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he @@ -35420,6 +35447,9 @@ he he he he +ym +yn +oq he he he @@ -35431,12 +35461,9 @@ he he he he -he -he -he -he -he -he +ym +yn +oq he he he diff --git a/maps/victory/levels/deck2.dmm b/maps/victory/levels/deck2.dmm index 7f5c198ab856..1a9452fd59f7 100644 --- a/maps/victory/levels/deck2.dmm +++ b/maps/victory/levels/deck2.dmm @@ -5,12 +5,32 @@ /turf/simulated/floor/plating, /area/space) "aaJ" = ( -/obj/machinery/door/airlock{ - name = "Cyborg Recharging"; - id_tag = "bartoliet1" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/detectives_office) "abo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -32,15 +52,22 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "adl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/effect/floor_decal/techfloor, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "adV" = ( /turf/simulated/floor/tiled, /area/security/lobby) @@ -65,16 +92,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "afH" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/structure/closet/crate/bin{ + anchored = 1 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/structure/sign/department/interrogation{ + pixel_y = -32 }, -/obj/structure/flora/pottedplant/smalltree, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "agu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -100,14 +125,11 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) "ahK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/airless, /area/maintenance/dormitory) "aiq" = ( /obj/machinery/button/windowtint{ @@ -184,11 +206,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "amn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/techfloor/corner{ +/obj/structure/bed/chair{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) "amV" = ( @@ -261,32 +287,10 @@ /turf/simulated/floor/tiled, /area/hydroponics) "asS" = ( -/obj/structure/table/rack/shelf/steel, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/clothing/suit/armor/pcarrier/ballistic{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/ballistic{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/ballistic{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/ballistic{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/space) "atd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -381,16 +385,68 @@ /turf/simulated/floor/plating, /area/space) "awR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/armguards/ablative{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/ablative{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ablative{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/effect/floor_decal/corner/red/full{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/dark, +/area/space) "awT" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -404,65 +460,40 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "axe" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/prison/cell_block) +/turf/simulated/floor/tiled/old_cargo/white, +/area/crew_quarters/heads/hos) "axq" = ( -/obj/structure/table/rack/shelf/steel, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/clothing/suit/armor/pcarrier/riot{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/riot{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/riot{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/riot{ - pixel_x = -5; - pixel_y = -2 +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armorytactical"; + name = "Tactical Armory Access" }, +/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/item/shield/riot{ - pixel_x = 11; - pixel_y = -3 - }, -/obj/item/shield/riot{ - pixel_x = 11; - pixel_y = -3 - }, -/obj/item/shield/riot{ - pixel_x = 11; - pixel_y = -3 + dir = 9 }, -/obj/item/shield/riot{ - pixel_x = 11; - pixel_y = -3 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) -"ayj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/techfloor, -/obj/structure/bed/chair/sofa/black/left, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/space) +"ayj" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, /area/crew_quarters/bar) "ayM" = ( /obj/structure/sink{ @@ -530,10 +561,14 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aBI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/structure/cable/green, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/space) "aBO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -545,13 +580,11 @@ /turf/simulated/floor/crystal, /area/station/stairs_two) "aCs" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 1 - }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_6) "aCx" = ( /obj/structure/table/woodentable, @@ -574,66 +607,13 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) "aEf" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/black/full, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/accessory/armor/armorplate/heavy{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/heavy{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/heavy{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/ballistic{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/ballistic{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/ballistic{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/combat{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/combat{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/combat{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/tactical{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/tactical{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/tactical{ - pixel_x = 5; - pixel_y = -3 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/gun/energy/phasegun/rifle, +/obj/item/gun/energy/phasegun/rifle, /turf/simulated/floor/tiled/dark, -/area/security/tactical) +/area/space) "aEF" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -701,20 +681,22 @@ /turf/simulated/floor/tiled, /area/security/lobby) "aFu" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/airlock/voidcraft{ - frequency = 2020; - id_tag = "belt_shuttle_exterior"; - name = "maintenance hatch" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "secondary fuel pump" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/airless, -/area/space) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "aFE" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -738,17 +720,13 @@ /turf/space/basic, /area/security/breakroom) "aHL" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled/monotile, +/area/space) "aHS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -773,10 +751,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "aII" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 7 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/maintenance/dormitory) "aJE" = ( /obj/effect/floor_decal/borderfloor{ @@ -808,15 +787,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "aKz" = ( -/obj/machinery/vending/cigarette, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/obj/structure/table/steel, +/obj/item/storage/box/evidence, +/obj/item/camera, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "aKP" = ( /obj/structure/bed/chair{ dir = 8 @@ -849,9 +824,11 @@ /turf/simulated/floor/tiled/dark, /area/space) "aMt" = ( -/obj/machinery/shipsensors, -/turf/simulated/floor/airless, -/area/space) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/showers) "aMT" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -915,21 +892,22 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_10) "aOY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 }, -/obj/machinery/button/remote/blast_door{ - id = "armoryriot"; - name = "Emergency Armory Access"; - pixel_x = 25; - pixel_y = -6; - req_access = list(3) +/obj/machinery/door/airlock/glass/security{ + layer = 2.8; + name = "Security"; + req_one_access = null }, +/obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/space) "aPd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -983,11 +961,11 @@ /turf/simulated/floor/plating, /area/space) "aSr" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_6) +/turf/simulated/floor/lino, +/area/security/detectives_office) "aTD" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1018,13 +996,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "aVl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, +/obj/structure/lattice, +/obj/structure/grille, +/turf/space, /area/maintenance/dormitory) "aVS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1133,40 +1107,36 @@ /turf/simulated/floor/tiled/dark, /area/space) "aWC" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armorylight"; - name = "Light Armory Acccess" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) -"aWJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) -"aWP" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass/security{ - id_tag = "detdoor"; - name = "Forensics Lab"; - req_one_access = null +/obj/machinery/camera/network/security, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) +"aWJ" = ( +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/map_helper/access_helper/airlock/station/security/forensics, /turf/simulated/floor/tiled/dark, /area/space) +"aWP" = ( +/turf/space/basic, +/area/quartermaster/miningdock) "aXC" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -1204,24 +1174,13 @@ /turf/simulated/floor/plating, /area/station/stairs_two) "aYH" = ( -/obj/structure/closet/gmcloset{ - name = "formal wardrobe" - }, -/obj/item/glass_jar, -/obj/item/retail_scanner/civilian, -/obj/item/retail_scanner/civilian, -/obj/item/clothing/accessory/hawaii/random, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "bbg" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate/trashcart, -/obj/item/instrument/banjo, -/turf/simulated/floor/tiled, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "bbG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -1253,9 +1212,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "bdF" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/holopad/ship, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "bdR" = ( /obj/machinery/camera/network/security{ dir = 4 @@ -1266,20 +1228,38 @@ /turf/simulated/floor/tiled, /area/space) "bew" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/computer/shuttle_control/explore/mining{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/qm) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "beS" = ( -/turf/simulated/wall/prepainted/civilian, -/area/janitor) -"bfv" = ( -/obj/structure/toilet{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/white, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/space) +"bfv" = ( +/turf/space/basic, /area/crew_quarters/barrestroom) "bfw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1309,26 +1289,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "bgj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 + icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -1345,14 +1310,11 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "bhZ" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/obj/structure/table/reinforced, +/obj/item/mass_spectrometer/adv, +/obj/item/reagent_scanner, +/turf/simulated/floor/tiled/old_cargo/white, +/area/crew_quarters/heads/hos) "bic" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/green{ @@ -1514,13 +1476,8 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "bpN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/ore_box, -/turf/simulated/floor/tiled/steel, -/area/space) +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "bpQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1543,13 +1500,11 @@ /turf/simulated/floor/airless, /area/space) "bpV" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, -/obj/effect/floor_decal/corner/red{ - dir = 9 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/r_wall/prepainted/security, /area/space) "bqx" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -1599,9 +1554,33 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "btb" = ( -/obj/structure/table/reinforced, -/obj/item/forensics/sample_kit/powder, -/turf/simulated/floor/tiled/old_cargo/white, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/rack/shelf/steel, +/obj/item/cell/device/weapon{ + pixel_x = -8 + }, +/obj/item/cell/device/weapon{ + pixel_x = -4 + }, +/obj/item/cell/device/weapon{ + pixel_x = -1 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/obj/item/cell/device/weapon{ + pixel_x = 8 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/obj/item/cell/device/weapon{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled/dark, /area/space) "btN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1620,55 +1599,15 @@ /turf/simulated/floor/plating, /area/space) "buj" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, +/turf/space/basic, /area/security/armoury) "buV" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_10) "bvq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/door_timer/cell_3{ - pixel_x = 32; - pixel_y = -32 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/prison/cell_block) +/obj/structure/lattice, +/turf/space, +/area/crew_quarters/sleep/Dorm_11) "bvw" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1679,21 +1618,20 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "bvG" = ( -/obj/structure/table/steel, -/obj/item/storage/box/donkpockets, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/machinery/vending/wallmed1{ - name = "Emergency NanoMed"; - pixel_y = 32 - }, -/obj/machinery/camera/network/security{ - dir = 8 +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "mining_docker"; + pixel_y = 27; + tag_airpump = "civvie_vent"; + tag_chamber_sensor = "civvie_sensor"; + tag_exterior_door = "civvie_door_Ro"; + tag_exterior_sensor = "civvie_exterior_sensor"; + tag_interior_door = "civvie_door_Ri"; + tag_interior_sensor = "civvie_exp_psg" }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_lockerroom) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "bwV" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, @@ -1729,9 +1667,24 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "byd" = ( +/obj/item/material/ashtray/bronze, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/camera/network/security{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, /obj/structure/table/steel, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/interrogation) +/obj/item/toy/figure/secofficer, +/turf/simulated/floor/tiled, +/area/prison/cell_block) "bzQ" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -1782,16 +1735,41 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "bCg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/button/remote/blast_door{ + id = "armorytactical"; + name = "Tactical Armory Access"; + pixel_x = -25; + pixel_y = -6; + req_access = list(3) }, -/obj/structure/closet/hydrant{ - pixel_x = -32 +/obj/effect/floor_decal/corner/black/full{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/obj/machinery/camera/network/security, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/shelf/steel, +/obj/item/gun/ballistic/automatic/wt550{ + pixel_y = 7 + }, +/obj/item/gun/ballistic/automatic/wt550{ + pixel_y = -7 + }, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/obj/item/ammo_magazine/a9mm/top_mount, +/turf/simulated/floor/tiled/dark, +/area/space) "bCK" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -1825,83 +1803,8 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "bDv" = ( -/obj/structure/table/rack/shelf/steel, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/clothing/mask/balaclava{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/clothing/mask/balaclava{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/clothing/mask/balaclava{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/clothing/mask/balaclava{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/clothing/head/helmet/riot{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/riot{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/riot{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/riot{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/clothing/accessory/armor/legguards/riot{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/legguards/riot{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/legguards/riot{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/legguards/riot{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/armguards/riot{ - pixel_x = -4; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/armguards/riot{ - pixel_x = -4; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/armguards/riot{ - pixel_x = -4; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/armguards/riot{ - pixel_x = -4; - pixel_y = -7 - }, -/obj/effect/floor_decal/corner/red/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/wood, +/area/crew_quarters/showers) "bDI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -1913,19 +1816,10 @@ /turf/simulated/floor/tiled/dark, /area/space) "bFt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 22 - }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/obj/structure/table/steel, +/obj/random/drinkbottle, +/turf/simulated/floor/tiled/monotile, +/area/space) "bFT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -1934,20 +1828,29 @@ /turf/simulated/floor/tiled, /area/crew_quarters/toilet) "bGf" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate/trashcart, -/obj/item/instrument/bikehorn, -/turf/simulated/floor/tiled, -/area/maintenance/dormitory) +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/sleep/Dorm_8) "bGk" = ( +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/obj/machinery/door/airlock/maintenance, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/space) "bGL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -1969,16 +1872,14 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "bIg" = ( -/obj/machinery/computer/ship/helm{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 }, -/obj/item/gps/internal/base{ - desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; - gps_tag = "SHUTTLE"; - name = "shuttle beacon" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel, -/area/space) +/turf/simulated/floor/tiled, +/area/victory/surfacebase/bar_backroom) "bIK" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -1986,10 +1887,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "bIN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/light/small, +/obj/machinery/suit_cycler{ + req_access = null }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_1) "bKe" = ( /obj/structure/fitness/weightlifter, @@ -2047,10 +1949,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "bMS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloorblack, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/space) "bNm" = ( /obj/machinery/mineral/equipment_vendor, /obj/effect/floor_decal/borderfloor{ @@ -2062,29 +1967,40 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "bOa" = ( -/obj/item/storage/secure/safe{ - pixel_y = -26 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) -"bOp" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armoryriot"; - name = "Emergency Armory Access" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 6 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24; + pixel_y = 6 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = -7 }, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/space) +"bOp" = ( +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/structure/reagent_dispensers/beerkeg, +/turf/simulated/floor/wood, +/area/maintenance/bar/lower) "bOL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -2149,16 +2065,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "bRc" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/structure/railing, +/turf/space, /area/crew_quarters/sleep/Dorm_9) "bRJ" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -2196,23 +2107,28 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "bUa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/table/woodentable, +/obj/item/clothing/accessory/permit/gun, +/obj/item/clothing/accessory/permit/gun, +/obj/item/clothing/accessory/permit/gun, +/obj/item/clothing/accessory/permit/gun, +/obj/item/clothing/accessory/permit/gun, +/obj/item/paper{ + desc = ""; + info = "In the event that more weapon permits are needed, please fax Central Command to request more. Please also include a reason for the request. Blank permits will be shipped to cargo for pickup. If long-term permits are desired, please contact your Nanotrasen Employee Representitive for more information."; + name = "note from CentCom about permits" }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 4 +/obj/machinery/camera/network/security{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/item/clothing/accessory/permit/gun{ + desc = "An example of a card indicating that the owner is allowed to carry a firearm. There's a note saying to fax CentCom if you want to order more blank permits."; + name = "sample weapon permit"; + owner = 1; + pixel_y = 10 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/security/hallway) "bUg" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 1 @@ -2236,11 +2152,15 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "bUJ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "bUV" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2338,18 +2258,16 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "caw" = ( -/obj/machinery/power/solar_control, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/area/security/detectives_office) "cax" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/door/airlock{ + name = "Restroom" }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) "cbf" = ( /obj/machinery/computer/secure_data, /obj/machinery/light{ @@ -2371,18 +2289,11 @@ /turf/simulated/floor/carpet, /area/space) "ccQ" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 - }, -/obj/item/storage/box/flashbangs{ - pixel_y = 7 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/red/full, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/storage/box/flashbangs, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "ccY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2405,20 +2316,34 @@ /turf/simulated/floor/airless, /area/space) "cdz" = ( -/obj/machinery/dnaforensics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/area/security/detectives_office) "cdC" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/qm) "cdP" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/goggles, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/machinery/door/firedoor, +/obj/item/gun/energy/laser/practice, +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "cdS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2427,16 +2352,14 @@ /turf/simulated/floor/tiled/dark, /area/space) "cdV" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/security{ - name = "Cell Block"; - req_one_access = null +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/dark, -/area/prison/cell_block) +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/space) "ceK" = ( /obj/machinery/computer/security/telescreen{ pixel_y = 32 @@ -2511,15 +2434,18 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) "cig" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/structure/closet/wardrobe, -/turf/simulated/floor/wood, +/obj/random/trash_pile, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "cil" = ( -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/space) "cip" = ( /obj/structure/closet/secure_closet/hos2, /obj/item/storage/box/firingpins, @@ -2529,14 +2455,20 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "ckf" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/machinery/door/airlock/voidcraft{ + frequency = 2020; + id_tag = "belt_shuttle_exterior"; + name = "maintenance hatch" }, -/turf/simulated/shuttle/wall/voidcraft/green, -/area/space) +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4; + name = "secondary fuel pump" + }, +/turf/simulated/floor/airless, +/area/victory/surfacebase/mining_main/eva) "ckn" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/foyer) @@ -2555,11 +2487,25 @@ /turf/simulated/floor/wood, /area/space) "cmk" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +/obj/effect/floor_decal/corner/red{ + dir = 6 }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, /area/space) "cmF" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -2612,21 +2558,14 @@ /turf/simulated/wall/r_wall/prepainted/security, /area/space) "coV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/holopad, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "cqi" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2732,29 +2671,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "cyv" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/black/full{ +/obj/effect/floor_decal/corner/red{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/fire_alarm/east_mount, -/obj/structure/table/rack/shelf/steel, -/obj/item/gun/ballistic/fiveseven, -/obj/item/gun/ballistic/fiveseven, -/obj/item/gun/ballistic/fiveseven, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, -/obj/item/ammo_magazine/a5_7mm/five_seven/ap, /turf/simulated/floor/tiled/dark, -/area/security/tactical) +/area/space) "cyR" = ( /obj/machinery/suit_cycler/mining, /obj/effect/floor_decal/borderfloor{ @@ -2785,12 +2709,10 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "czZ" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "cAi" = ( /obj/machinery/door/airlock/glass_external{ @@ -2871,21 +2793,10 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "cDK" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/metaglass, +/turf/simulated/floor/tiled/monotile, +/area/space) "cDM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2896,12 +2807,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "cDW" = ( +/obj/machinery/door/firedoor, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "0-2" }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/security/lobby) "cEl" = ( /obj/machinery/light/small{ dir = 4 @@ -2967,11 +2880,13 @@ /turf/simulated/floor/tiled, /area/maintenance/bar/lower) "cHF" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 4 +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 1; + volume = 20000 }, -/turf/simulated/shuttle/plating/airless/carry, -/area/space) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/airless, +/area/victory/surfacebase/mining_main/eva) "cIn" = ( /obj/structure/table/steel, /obj/item/soap, @@ -3190,24 +3105,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_6) "cTj" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/goggles, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/item/gun/energy/laser/practice, -/obj/machinery/light_switch{ - pixel_y = -26 - }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/tiled/steel/airless, +/area/shuttle/belter) "cTB" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/camera/network/civilian{ @@ -3216,25 +3121,17 @@ /turf/simulated/floor/tiled/dark, /area/space) "cUC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/structure/grille, +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/obj/structure/sign/department/interrogation{ - pixel_y = 30 +/obj/structure/cable/green, +/obj/structure/window/reinforced/polarized/full{ + id = "Interr"; + name = "interrogation window" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, /area/security/hallway) "cUW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3261,14 +3158,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/directions/roomnum{ - dir = 5; - pixel_x = -32; + dir = 6; + pixel_x = -31; pixel_y = -3 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "cVH" = ( @@ -3286,17 +3182,22 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "cWS" = ( -/turf/simulated/wall/prepainted/security, -/area/security/security_lockerroom) +/obj/structure/table/steel, +/obj/item/folder/red, +/obj/item/folder/red{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "cXe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_1) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "cXs" = ( /obj/structure/table/woodentable, /obj/machinery/keycard_auth{ @@ -3365,26 +3266,16 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "dah" = ( -/obj/effect/floor_decal/techfloor, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) -"daA" = ( -/obj/effect/floor_decal/techfloor, -/obj/machinery/computer/guestpass{ +/obj/item/radio/intercom{ dir = 1; - pixel_y = -28 + name = "Station Intercom (General)"; + pixel_y = 26 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) -"daQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -3396,6 +3287,19 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, +/area/space) +"daA" = ( +/obj/effect/floor_decal/techfloor, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"daQ" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/hosdouble, +/turf/simulated/floor/carpet/purcarpet, /area/security/prison) "daW" = ( /obj/machinery/conveyor{ @@ -3405,30 +3309,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "dby" = ( -/obj/machinery/access_button{ - command = "cycle_int"; - frequency = 1379; - master_tag = "mining_fore_airlock"; - name = "interior access button"; - pixel_y = -23; - req_one_access = list(48) - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_fore_inner"; - locked = 1; - name = "Engineering Fore Internal Access"; - req_one_access = null +/obj/machinery/atmospherics/component/unary/engine{ + dir = 8 }, -/obj/map_helper/access_helper/airlock/station/external_airlock, -/turf/simulated/floor/tiled, +/turf/simulated/shuttle/plating/airless/carry, /area/victory/surfacebase/mining_main/refinery) "dcy" = ( /obj/machinery/computer/cryopod/robot{ @@ -3488,12 +3372,6 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"dfP" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/space) "dgl" = ( /obj/structure/bed/padded, /obj/machinery/light{ @@ -3573,14 +3451,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "dkB" = ( -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379; - id_tag = "mining_fore_pump" +/obj/structure/shuttle/engine/heater{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/simulated/shuttle/wall/voidcraft/green, /area/victory/surfacebase/mining_main/eva) "dkF" = ( /obj/structure/sign/directions/evac{ @@ -3593,10 +3468,13 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "dlY" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/simulated/floor/wood, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/simulated/floor/airless, /area/crew_quarters/recreation_area) "dms" = ( /obj/structure/cable/green{ @@ -3620,14 +3498,20 @@ /turf/simulated/wall/prepainted, /area/vacant/vacant_office) "dnz" = ( -/turf/simulated/wall/r_wall/prepainted, +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "dnX" = ( -/obj/structure/railing{ - dir = 1 - }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate/trashcart, +/obj/item/instrument/banjo, /turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/area/crew_quarters/recreation_area) "dod" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -3693,9 +3577,15 @@ /turf/simulated/floor/wood, /area/space) "dpN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Solar Farm Input"; + name_tag = "Solar Farm Input" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow, +/turf/simulated/floor/airless, /area/crew_quarters/recreation_area) "dqk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -3717,10 +3607,7 @@ /turf/simulated/floor/wood, /area/space) "drw" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -26 - }, -/turf/simulated/floor/plating, +/turf/space/basic, /area/maintenance/dormitory) "drx" = ( /obj/structure/cable/green{ @@ -3760,9 +3647,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "dsd" = ( -/obj/structure/table/steel, -/obj/item/reagent_containers/food/drinks/cans/waterbottle, -/turf/simulated/floor/tiled/monotile, +/obj/structure/undies_wardrobe, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/space) "dsr" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3810,21 +3699,35 @@ /turf/simulated/floor/carpet/bcarpet, /area/space) "duB" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) -"duV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/corner/red/border{ + dir = 6 }, -/turf/simulated/floor/wood, +/obj/structure/sign/department/armory{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/space) +"duV" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/sleep/Dorm_11) "dvB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/structure/table/steel, +/obj/item/folder/red, +/obj/item/folder/red{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/machinery/recharger, +/obj/item/book/manual/security_space_law, +/obj/machinery/light, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "dwj" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -3844,13 +3747,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "dxg" = ( +/obj/machinery/door/firedoor, /obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/techfloor{ - dir = 1 + icon_state = "0-2" }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, /area/crew_quarters/bar) "dxS" = ( /obj/machinery/shield_diffuser, @@ -3873,10 +3776,13 @@ /turf/simulated/floor/plating, /area/space) "dyA" = ( -/obj/structure/table/steel, -/obj/item/storage/box/handcuffs, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monotile, +/area/prison/cell_block) "dyR" = ( /turf/simulated/floor/tiled, /area/hydroponics) @@ -3902,11 +3808,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "dzk" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/shuttle/wall/voidcraft/green, +/area/shuttle/belter) "dzl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3930,16 +3833,10 @@ /turf/simulated/floor/tiled, /area/security/lobby) "dAo" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/airlock/glass{ + name = "Eva Storage" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "dAA" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -4032,19 +3929,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "dFd" = ( -/obj/machinery/airlock_sensor{ - id_tag = "mining_fore_sensor"; - pixel_y = 26 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "mining_fore_pump" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/corner/red{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/quartermaster/miningdock) +/turf/simulated/floor/tiled/dark, +/area/space) "dFk" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -4123,23 +4015,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"dIC" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 8 - }, -/obj/structure/table/steel, -/obj/item/storage/box/firingpins, -/obj/item/storage/box/firingpins, -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 - }, -/obj/machinery/camera/network/security, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) -"dIZ" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) "dJg" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, @@ -4159,23 +4034,14 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "dKE" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) +/area/crew_quarters/toilet) "dKF" = ( -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/sleep/Dorm_8) "dKK" = ( /obj/structure/cable/green{ @@ -4185,20 +4051,12 @@ /turf/simulated/floor/wood, /area/space) "dKY" = ( -/obj/machinery/button/remote/airlock{ - id = "dorm8"; - name = "Room 8 Lock"; - pixel_x = 24; - pixel_y = -4; - specialfunctions = 4 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/machinery/atmospherics/portables_connector, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/wood, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "dLs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4318,38 +4176,36 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "dSS" = ( -/obj/structure/closet/l3closet/security, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) -"dTo" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/camera/network/civilian{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/wood, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/old_cargo/white, +/area/security/detectives_office) +"dTo" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled, /area/crew_quarters/recreation_area) "dTF" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/sleep/Dorm_8) "dTY" = ( /turf/space/basic, /area/shuttle/mining_ship/general) @@ -4381,9 +4237,58 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "dUT" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_1) +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "dUX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4410,24 +4315,17 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "dXb" = ( +/obj/machinery/door/firedoor, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ - id_tag = "dorm11"; - name = "Dorm 11" - }, -/obj/machinery/door/firedoor{ - dir = 8 + name = "Custodial Closet" }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/map_helper/access_helper/airlock/station/service/janitor, +/turf/simulated/floor/tiled/dark, +/area/space) "dXA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4435,17 +4333,18 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "dXK" = ( -/obj/machinery/button/remote/blast_door{ - id = "armorylight"; - name = "Light Armory Access"; - pixel_x = -6; - pixel_y = -25; - req_access = list(3) +/obj/effect/floor_decal/techfloor/corner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/prison/cell_block) "dYm" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -4543,17 +4442,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "edz" = ( -/obj/machinery/button/remote/airlock{ - id = "dorm9"; - name = "Room 9 Lock"; - pixel_x = 26; - pixel_y = -4; - specialfunctions = 4 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/turf/simulated/floor/wood, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_9) "eeI" = ( /obj/structure/table/standard, @@ -4615,32 +4505,21 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "eic" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"eiD" = ( -/obj/item/material/ashtray/bronze, -/obj/effect/floor_decal/techfloor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/camera/network/security{ - dir = 1 +/obj/effect/floor_decal/corner/red{ + dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/space) +"eiD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/structure/table/steel, -/obj/item/toy/figure/secofficer, -/turf/simulated/floor/tiled, -/area/security/lobby) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "ejW" = ( /obj/structure/closet/chefcloset, /obj/item/glass_jar, @@ -4829,42 +4708,16 @@ }, /turf/simulated/floor/tiled/dark, /area/space) -"erc" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_1) "ery" = ( -/obj/structure/table/rack/shelf/steel, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/clothing/suit/armor/pcarrier/ablative{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/ablative{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/ablative{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/clothing/suit/armor/pcarrier/ablative{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/effect/floor_decal/corner/red{ - dir = 10 +/obj/structure/closet/crate/bin{ + anchored = 1 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/random/plushie, +/obj/machinery/camera/network/security{ + dir = 4 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled/monotile, +/area/victory/surfacebase/bar_backroom) "erM" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green, @@ -4915,14 +4768,21 @@ /turf/simulated/wall/prepainted/security, /area/crew_quarters/heads/hos) "esO" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/machinery/door/airlock/command{ + id_tag = "HoSdoor"; + name = "Head of Security"; + req_one_access = null }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/map_helper/access_helper/airlock/station/head_office/head_of_security, /turf/simulated/floor/tiled/dark, -/area/space) +/area/security/hallway) "eud" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/showers) @@ -4964,22 +4824,25 @@ /turf/simulated/floor/tiled/dark, /area/space) "exM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/window/brigdoor/southleft{ + dir = 4; + id = "Cell 3"; + name = "Cell 3"; + req_access = list(2) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/old_cargo/gray, /area/security/hallway) "exQ" = ( /obj/structure/window/basic{ @@ -5013,31 +4876,17 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/space) "ezY" = ( -/obj/structure/closet/hydrant{ - pixel_y = 30 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/item/gun/ballistic/shotgun/flare, -/obj/item/storage/box/flashshells, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/meter, -/obj/item/duct_tape_roll, -/turf/simulated/floor/airless, +/obj/effect/floor_decal/corner/blue, +/turf/simulated/floor/tiled/dark, /area/space) "eAa" = ( -/obj/structure/dogbed, -/obj/machinery/camera/network/civilian, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, -/mob/living/simple_mob/animal/passive/bird/ringneck_dove{ - desc = "The bartenders newest pet on the station. They seem like they want to help you out."; - name = "Brewster" - }, -/turf/simulated/floor/wood, +/turf/simulated/wall/r_wall/prepainted/security, /area/victory/surfacebase/bar_backroom) "eAb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5056,17 +4905,26 @@ /turf/simulated/floor/plating, /area/space) "eAf" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/corner/red/border{ - dir = 1 + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/security/hallway) "eAg" = ( @@ -5086,12 +4944,15 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "eBc" = ( -/obj/structure/undies_wardrobe, -/obj/machinery/light{ - dir = 1 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/structure/filingcabinet/tall, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "eBA" = ( /obj/item/stool/padded, /turf/simulated/floor/wood, @@ -5148,10 +5009,12 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "eEI" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "eFD" = ( /obj/structure/table/bench/steel, @@ -5169,22 +5032,27 @@ /turf/simulated/floor/tiled/dark, /area/space) "eGo" = ( -/obj/structure/table/steel, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/steel, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 }, -/obj/machinery/camera/network/security, -/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/security/detectives_office) "eGA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5223,13 +5091,15 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "eJf" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4 +/obj/structure/toilet{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/light/small, +/obj/landmark{ + name = "xeno_spawn"; + pixel_x = -1 }, -/turf/simulated/shuttle/wall/voidcraft/green, +/turf/simulated/floor/tiled/white, /area/space) "eJR" = ( /obj/effect/floor_decal/borderfloor{ @@ -5251,32 +5121,29 @@ /turf/simulated/floor/tiled, /area/hydroponics) "eKd" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock{ - id_tag = "dorm8"; - name = "Dorm 8" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "eKv" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/machinery/ai_status_display{ + pixel_y = 32 }, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, /turf/simulated/floor/tiled/monotile, -/area/space) +/area/victory/surfacebase/bar_backroom) "eKD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5361,12 +5228,7 @@ /turf/simulated/floor/plating, /area/security/detectives_office) "eNR" = ( -/obj/structure/toilet{ - pixel_y = 10 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "eOi" = ( @@ -5395,26 +5257,14 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "eSr" = ( -/obj/machinery/door/window/brigdoor/southleft{ - dir = 4; - id = "Cell 3"; - name = "Cell 3"; - req_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/prison/cell_block) +/turf/simulated/floor/carpet/bcarpet, +/area/maintenance/dormitory) "eSu" = ( /obj/structure/table/marble, /obj/machinery/microwave, @@ -5447,21 +5297,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "eUw" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/turf/space, +/area/crew_quarters/bar) "eUx" = ( /obj/structure/sign/directions/medical{ dir = 8; @@ -5488,12 +5325,16 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "eVw" = ( -/obj/structure/window/reinforced/tinted{ +/obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/structure/closet/jcloset, +/obj/random/soap, +/obj/item/mop, +/obj/item/storage/bag/trash, +/obj/item/lightreplacer, +/turf/simulated/floor/tiled/dark, +/area/maintenance/bar/lower) "eVR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -5515,15 +5356,18 @@ /area/station/stairs_two) "eWV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/cable/green{ + icon_state = "4-8" }, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-8" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/blue{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/space) "eXk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5548,13 +5392,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/camera/network/security{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/space) "eXQ" = ( /obj/machinery/mineral/input, @@ -5623,14 +5476,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "eYj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled/dark, +/area/space) "eYI" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -5729,43 +5578,55 @@ }, /turf/simulated/floor/tiled/dark, /area/space) -"feh" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) "feP" = ( /obj/effect/floor_decal/techfloor/corner, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "feT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_1) +/turf/simulated/floor/tiled/dark, +/area/space) "feZ" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/hallway/primary/port) "ffu" = ( -/turf/simulated/shuttle/wall/voidcraft/no_join, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, /area/space) "ffQ" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/machinery/door/airlock/glass/security{ - name = "Cell Block"; - req_one_access = null +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + name = "Security" }, /obj/map_helper/access_helper/airlock/station/security/general, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/dark, -/area/prison/cell_block) +/area/space) "ffS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -5844,10 +5705,15 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "fhg" = ( -/obj/structure/janitorialcart, -/obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/obj/machinery/door/window/brigdoor/westright{ + dir = 4; + name = "Firing Range Door" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "fhF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -5868,23 +5734,29 @@ /turf/simulated/floor/tiled/dark, /area/security/interrogation) "fhP" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armoryriot"; - name = "Emergency Armory Access" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 +/obj/machinery/light{ + dir = 1 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/effect/floor_decal/corner/black/full{ + dir = 1 }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/fire_alarm/east_mount, +/obj/structure/table/rack/shelf/steel, +/obj/item/gun/ballistic/fiveseven, +/obj/item/gun/ballistic/fiveseven, +/obj/item/gun/ballistic/fiveseven, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, +/obj/item/ammo_magazine/a5_7mm/five_seven/ap, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/space) "fif" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5923,17 +5795,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "fip" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/camera/network/civilian{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/turf/simulated/wall/r_wall/prepainted/security, +/area/security/detectives_office) "fiA" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/spacespice{ @@ -5981,9 +5844,16 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "fjr" = ( -/obj/machinery/suit_cycler/headofsecurity, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "fju" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -6043,38 +5913,30 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area_hallway) "fmE" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/lino, +/obj/machinery/door/window/brigdoor/westright{ + dir = 4; + name = "Firing Range Door" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile/gray, /area/space) "fnd" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/cargo) "fnf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/area/maintenance/dormitory) "fnw" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/tiled/monotile, +/area/victory/surfacebase/bar_backroom) "fnN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6155,12 +6017,7 @@ /turf/simulated/floor/plating, /area/space) "fsq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/janitor) "fsB" = ( /obj/effect/floor_decal/spline/plain{ @@ -6211,6 +6068,9 @@ /turf/simulated/floor, /area/space) "fwa" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -6218,19 +6078,26 @@ dir = 4 }, /obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-4" }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/door_timer/cell_3{ + pixel_x = 32; + pixel_y = -32 }, /obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /obj/effect/floor_decal/corner/red/border{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -6239,14 +6106,10 @@ /turf/simulated/floor/plating, /area/space) "fwO" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/security{ - name = "Interrogation"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/dark, -/area/security/interrogation) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/space) "fwY" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -6288,11 +6151,13 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "fzp" = ( +/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/structure/ore_box, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "fzv" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, @@ -6308,7 +6173,92 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "fAm" = ( -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/medium{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/space) "fAs" = ( /obj/machinery/door/firedoor/glass, @@ -6329,20 +6279,37 @@ /turf/simulated/floor/crystal, /area/station/stairs_two) "fBq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/machinery/door/window/northleft{ + name = "Shower"; + req_access = list() + }, +/obj/structure/curtain/open/shower/engineering, +/turf/simulated/floor/tiled, +/area/maintenance/dormitory) "fCl" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "fCs" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6384,20 +6351,11 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "fDp" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/showers) "fEg" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -6409,35 +6367,25 @@ /turf/simulated/floor/tiled, /area/hydroponics) "fEj" = ( -/obj/structure/table/woodentable, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/packageWrap, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/machinery/light_switch{ - pixel_x = -9; - pixel_y = 30 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/victory/surfacebase/bar_backroom) -"fEK" = ( -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/turf/simulated/floor/tiled/old_cargo/white, +/area/security/detectives_office) +"fEK" = ( +/obj/landmark{ + name = "blobstart" }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/tiled, /area/space) "fEO" = ( -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "fGd" = ( /obj/structure/table/rack, @@ -6515,14 +6463,9 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "fIK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/landmark/spawnpoint/job/janitor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/maintenance/bar/lower) "fJa" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -6552,67 +6495,21 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/space) "fKv" = ( -/obj/structure/table/rack/shelf/steel, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/clothing/accessory/armor/legguards/ballistic{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/clothing/accessory/armor/legguards/ballistic{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/clothing/accessory/armor/legguards/ballistic{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/clothing/accessory/armor/legguards/ballistic{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/clothing/accessory/armor/armguards/ballistic{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/clothing/accessory/armor/armguards/ballistic{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/clothing/accessory/armor/armguards/ballistic{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/clothing/accessory/armor/armguards/ballistic{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/clothing/head/helmet/ballistic{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/ballistic{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/ballistic{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/ballistic{ - pixel_x = 5; - pixel_y = 4 +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/effect/floor_decal/corner/red{ - dir = 5 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/obj/structure/wall_frame/prepainted, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/security/hallway) "fLr" = ( /obj/machinery/washing_machine, /obj/structure/window/reinforced/tinted{ @@ -6633,16 +6530,19 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "fMn" = ( -/obj/structure/window/reinforced/tinted{ - dir = 1 +/obj/structure/table/steel, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/vending/sovietsoda{ - name = "Water Dispenser" +/obj/structure/window/reinforced, +/obj/item/storage/box/teargas{ + pixel_y = 3 }, -/obj/machinery/light{ - dir = 4 +/obj/effect/floor_decal/corner/red{ + dir = 10 }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, /area/space) "fMD" = ( /obj/machinery/vending/fitness, @@ -6658,14 +6558,8 @@ /turf/simulated/wall/prepainted/civilian, /area/hallway/primary/port) "fNk" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/security/interrogation) +/turf/simulated/floor/tiled/old_cargo/white, +/area/security/detectives_office) "fNm" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -6685,29 +6579,22 @@ /turf/simulated/floor/tiled/steel_grid, /area/victory/surfacebase/mining_main/refinery) "fON" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armorytactical"; - name = "Tactical Armory Access" - }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/lathe/autolathe, /turf/simulated/floor/tiled/dark, -/area/security/tactical) +/area/space) "fOO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -6725,14 +6612,13 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "fPx" = ( -/obj/machinery/flasher/portable, -/obj/machinery/light, -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/curtain/open/bed{ + anchored = 1; + name = "curtain" }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/turf/simulated/floor/plating, +/area/space) "fQb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6744,14 +6630,17 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "fQi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/airlock{ + name = "Restroom" }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/tiled/white, +/area/space) "fQF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6835,13 +6724,8 @@ /turf/simulated/floor/tiled/dark, /area/space) "fTV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "fUa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6852,49 +6736,14 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "fUp" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner/black/full{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/cable/green, -/obj/machinery/power/apc/east_mount, -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/head/helmet/ballistic{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -5; - pixel_y = -7 - }, -/obj/item/clothing/head/helmet/ballistic{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/ballistic{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -5; - pixel_y = -7 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -5; - pixel_y = -7 - }, -/obj/item/shield/riot/tower/swat{ - pixel_x = 4 - }, -/obj/item/shield/riot/tower/swat{ - pixel_x = 4 - }, -/obj/item/shield/riot/tower/swat{ - pixel_x = 4 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/dark, -/area/security/tactical) +/obj/structure/closet/crate, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "fUW" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 1 @@ -6932,15 +6781,24 @@ /turf/simulated/floor/tiled/monotile, /area/space) "fXd" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armorylight"; - name = "Light Armory Acccess" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/security/armoury) @@ -6954,18 +6812,17 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/miningdock) "fZl" = ( -/obj/structure/table/woodentable, -/obj/item/instrument/accordion, -/obj/machinery/computer/security/telescreen{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_6) "fZL" = ( -/obj/machinery/camera/network/cargo{ - dir = 4 +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled, /area/space) "gag" = ( /obj/effect/floor_decal/corner/green{ @@ -6981,15 +6838,12 @@ /turf/simulated/floor/tiled/dark, /area/space) "gav" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/chair/comfy/teal{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "gaF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -7000,29 +6854,12 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "gba" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - id_tag = "BrigFoyer"; - name = "Security" - }, -/obj/map_helper/access_helper/airlock/station/security/general, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +/obj/structure/closet/l3closet/security, +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, /turf/simulated/floor/tiled/dark, -/area/security/lobby) +/area/space) "gbS" = ( /obj/machinery/conveyor{ dir = 9; @@ -7066,16 +6903,14 @@ /turf/simulated/floor/crystal, /area/station/stairs_two) "gcA" = ( -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Solar Farm Input"; - name_tag = "Solar Farm Input" +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/structure/cable/yellow, -/turf/simulated/floor/airless, -/area/space) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "gcB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -7122,12 +6957,6 @@ /obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/space) -"gdV" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) "geo" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -7175,15 +7004,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "ggs" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/engineering{ - name = "Solars"; - req_one_access = null +/obj/structure/filingcabinet/chestdrawer, +/obj/item/radio/intercom{ + pixel_y = -24 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "ggC" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled, @@ -7285,8 +7111,20 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "gms" = ( -/obj/machinery/computer/ship/engines, -/turf/simulated/floor/airless, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/machinery/button/remote/blast_door{ + id = "armoryriot"; + name = "Emergency Armory Access"; + pixel_x = 25; + pixel_y = -6; + req_access = list(3) + }, +/turf/simulated/floor/tiled/dark, /area/space) "gnd" = ( /obj/structure/railing, @@ -7351,22 +7189,21 @@ /turf/simulated/floor/tiled, /area/space) "grM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "gsk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -7400,15 +7237,11 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "gup" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/firedoor, +/obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, /area/security/hallway) "guU" = ( /obj/machinery/gibber, @@ -7426,50 +7259,119 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "gvu" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 5 +/obj/machinery/door/window/eastleft{ + dir = 8 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-8" }, -/obj/machinery/light{ - dir = 1 +/turf/simulated/floor/tiled/monotile, +/area/victory/surfacebase/tram) +"gwR" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/blue{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/lathe/autolathe, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) -"gwR" = ( -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, -/turf/simulated/floor/wood, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_1) "gxF" = ( -/obj/machinery/holopad, -/obj/effect/floor_decal/corner/red{ - dir = 6 +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 }, -/obj/effect/floor_decal/corner/red{ - dir = 9 +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) -"gxS" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 }, -/obj/structure/mirror{ - pixel_x = -28 +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 }, -/turf/simulated/floor/tiled/white, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/legguards{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/armguards{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/armor/legguards/navy{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/clothing/accessory/armor/legguards/navy{ + pixel_x = 7; + pixel_y = -1 + }, +/obj/item/clothing/accessory/armor/armguards/navy, +/obj/item/clothing/accessory/armor/armguards/navy, +/obj/item/clothing/accessory/armor/legguards/navy{ + pixel_x = -4; + pixel_y = -1 + }, +/turf/simulated/floor/tiled/dark, +/area/space) +"gxS" = ( +/turf/simulated/wall/r_wall/prepainted/security, /area/crew_quarters/barrestroom) "gyt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -7497,8 +7399,14 @@ /turf/simulated/floor/wood, /area/quartermaster/foyer) "gAT" = ( -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/airless, +/area/maintenance/dormitory) "gBW" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7515,21 +7423,13 @@ /turf/simulated/floor/tiled, /area/hydroponics) "gCm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/security/security_lockerroom) +/area/security/prison) "gCI" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/wood, @@ -7614,20 +7514,20 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "gIa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/space) +/obj/structure/table/standard, +/obj/structure/bedsheetbin, +/obj/random/soap, +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "gIt" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "gIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -7673,16 +7573,15 @@ /turf/simulated/floor/tiled/dark, /area/space) "gLH" = ( -/obj/machinery/door/firedoor{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/sleep/Dorm_8) "gLM" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) @@ -7753,7 +7652,10 @@ /turf/simulated/floor/plating, /area/space) "gRy" = ( -/turf/simulated/wall/r_wall/prepainted/cargo, +/obj/machinery/atmospherics/component/unary/engine{ + dir = 8 + }, +/turf/simulated/shuttle/plating/airless/carry, /area/victory/surfacebase/mining_main/eva) "gRz" = ( /obj/machinery/door/firedoor, @@ -7784,15 +7686,33 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "gST" = ( -/turf/simulated/floor/wood, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "gTg" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 1379; + master_tag = "solar_dock"; + name = "interior access button"; + pixel_x = -28; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "gTv" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, @@ -7811,12 +7731,12 @@ /turf/simulated/floor/tiled/techfloor, /area/security/lobby) "gUi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/light, +/obj/machinery/computer/ship/sensors{ dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "gUw" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/cutout, @@ -7835,12 +7755,22 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/kitchen) "gVX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/door/airlock{ + name = "Bar Backroom" + }, +/obj/map_helper/access_helper/airlock/station/service/bar, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "gWe" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Cargo"; @@ -7853,15 +7783,14 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "gWm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/camera/network/engineering{ + dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/sleep/Dorm_8) "gWy" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -7898,17 +7827,11 @@ /turf/simulated/floor/tiled, /area/hydroponics) "gXy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "gXB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -7927,23 +7850,25 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "gYl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armoryriot"; + name = "Emergency Armory Access" }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/space) "gYA" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_fore_inner"; - locked = 1; - name = "Engineering Fore Internal Access"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/external_airlock, -/turf/simulated/floor/tiled, +/turf/space, /area/victory/surfacebase/mining_main/refinery) "gYF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7987,30 +7912,22 @@ /area/crew_quarters/sleep/Dorm_3) "gZF" = ( /obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor{ - dir = 8 + icon_state = "1-8" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/security/range) +/obj/structure/bed/double/padded, +/obj/random/bedsheet/double, +/turf/simulated/floor/wood, +/area/space) "gZJ" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "gZK" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/item/reagent_containers/glass/cooler_bottle, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -26 - }, -/obj/effect/floor_decal/corner/red{ - dir = 9 +/obj/machinery/newscaster{ + pixel_y = 32 }, -/turf/simulated/floor/tiled/dark, -/area/security/interrogation) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "gZU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -8041,28 +7958,21 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "hau" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/bcarpet, +/area/maintenance/dormitory) "hbv" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/security{ + name = "Interrogation"; + req_one_access = null }, +/obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/security/hallway) "hbx" = ( /obj/structure/closet/wardrobe/black, /turf/simulated/floor/wood, @@ -8107,21 +8017,32 @@ /turf/simulated/floor/plating, /area/space) "hdq" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/photocopier, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/obj/effect/floor_decal/corner/red{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "armorytactical"; + name = "Tactical Armory Access"; + pixel_x = 25; + pixel_y = -6; + req_access = list(3) + }, +/turf/simulated/floor/tiled/dark, +/area/space) "hdy" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 8 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/obj/machinery/mech_recharger, +/turf/simulated/floor/tiled/dark, +/area/space) "hdB" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -8663,19 +8584,18 @@ /turf/simulated/floor/carpet, /area/space) "hBs" = ( -/obj/structure/closet/l3closet/security, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "hBz" = ( -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 +/obj/machinery/door/airlock/engineering{ + name = "Solars"; + req_one_access = null }, -/turf/simulated/floor/wood, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "hBA" = ( /obj/effect/floor_decal/corner/green{ @@ -8688,16 +8608,7 @@ /turf/simulated/floor/tiled/dark, /area/space) "hCb" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, +/turf/space, /area/maintenance/dormitory) "hCZ" = ( /turf/simulated/wall/prepainted/cargo, @@ -8730,19 +8641,38 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "hEP" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "hFq" = ( /obj/structure/closet/secure_closet/detective, /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/lino, /area/space) "hGe" = ( -/turf/simulated/wall/prepainted, -/area/crew_quarters/recreation_area_hallway) +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/east_mount, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "hGR" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -8754,9 +8684,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "hHw" = ( -/obj/landmark{ - name = "blobstart" - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/crew_quarters/bar) "hIq" = ( @@ -8799,13 +8728,12 @@ /turf/simulated/floor/tiled/dark, /area/space) "hLZ" = ( -/obj/structure/table/reinforced, -/obj/item/forensics/sample_kit, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -28 +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/old_cargo/white, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monotile, /area/space) "hMe" = ( /obj/machinery/conveyor{ @@ -8868,15 +8796,36 @@ /turf/simulated/floor/tiled/dark, /area/security/interrogation) "hPX" = ( -/obj/structure/table/steel, -/turf/simulated/floor/tiled/old_cargo/gray, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/prison/cell_block) "hQC" = ( -/obj/structure/table/standard, -/obj/structure/bedsheetbin, -/obj/random/soap, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/structure/extinguisher_cabinet{ + pixel_y = -31 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/maintenance/bar/lower) "hQH" = ( /obj/machinery/light_switch{ dir = 8; @@ -8927,10 +8876,21 @@ /turf/simulated/floor/airless, /area/space) "hSj" = ( -/obj/structure/closet{ - name = "Evidence Closet" +/obj/effect/floor_decal/corner/black{ + dir = 9 }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/ammo_magazine/a7_62mm, +/obj/item/ammo_magazine/a7_62mm, +/obj/item/gun/ballistic/automatic/z8, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/space) "hTh" = ( /obj/structure/bed/chair/sofa, @@ -8949,11 +8909,9 @@ /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_11) "hUD" = ( -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/effect/floor_decal/steeldecal/steel_decals_central6, +/turf/simulated/floor/tiled, +/area/space) "hUZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -8966,9 +8924,6 @@ }, /turf/simulated/floor/tiled, /area/station/stairs_two) -"hVr" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) "hVB" = ( /obj/structure/cryofeed, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -9000,11 +8955,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "hWA" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/showers) "hXT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9036,16 +8997,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) -"hYS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external{ - req_one_access = null - }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) "hZb" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9056,11 +9007,14 @@ /turf/simulated/floor/tiled, /area/hydroponics) "hZf" = ( +/obj/structure/table/rack/shelf/steel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/range) +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/gun/energy/ionrifle, +/turf/simulated/floor/tiled/dark, +/area/space) "hZz" = ( /obj/machinery/mineral/output, /obj/effect/floor_decal/industrial/loading{ @@ -9070,25 +9024,31 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "iam" = ( -/obj/structure/table/steel, -/obj/item/folder/red, -/obj/item/folder/red{ - pixel_x = 3 +/obj/effect/floor_decal/corner/black{ + dir = 9 }, -/turf/simulated/floor/tiled, -/area/security/lobby) -"ibu" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/prison/cell_block) +/obj/machinery/holopad, +/turf/simulated/floor/tiled/dark, +/area/space) +"ibu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/space) "ibX" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -9144,13 +9104,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "ifA" = ( -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/landmark/spawnpoint/job/bartender, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/maintenance/bar/lower) "ige" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9230,9 +9187,19 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "ijr" = ( -/obj/structure/ladder, -/turf/simulated/floor/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "ikk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9429,8 +9396,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "isW" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/tactical) +/obj/spawner/window/reinforced/full/firelocks, +/obj/structure/curtain/open/bed{ + anchored = 1; + name = "curtain" + }, +/turf/simulated/floor/plating, +/area/space) "iti" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -9438,8 +9410,7 @@ /turf/simulated/floor/carpet/blucarpet, /area/space) "itV" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -9451,16 +9422,19 @@ /turf/simulated/floor/tiled, /area/hydroponics) "iwa" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/carpet/purcarpet, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "iwj" = ( /obj/machinery/shower{ @@ -9483,34 +9457,20 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "ixk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/table/rack/shelf/steel, -/obj/item/cell/device/weapon{ - pixel_x = -8 - }, -/obj/item/cell/device/weapon{ - pixel_x = -4 - }, -/obj/item/cell/device/weapon{ - pixel_x = -1 - }, -/obj/item/cell/device/weapon{ - pixel_x = 3 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, -/obj/item/cell/device/weapon{ - pixel_x = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/cell/device/weapon{ - pixel_x = 3 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/item/cell/device/weapon{ - pixel_x = 3 +/obj/machinery/camera/network/security{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/hallway) "ixv" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled, @@ -9526,14 +9486,18 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "izW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 5 }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_6) +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "iAa" = ( -/obj/machinery/newscaster, -/turf/simulated/wall/r_wall, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/space) "iAe" = ( /obj/structure/cable/green{ @@ -9642,8 +9606,13 @@ /turf/simulated/floor/tiled/dark, /area/space) "iHN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/area/space) "iIw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -9698,11 +9667,14 @@ /turf/simulated/floor/tiled/dark, /area/space) "iLT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/machinery/door/airlock/glass{ + name = "Bar" + }, +/turf/simulated/floor/tiled, +/area/space) "iLY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9809,20 +9781,25 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "iSr" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/cell_charger, -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled, +/area/space) "iSt" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/security_equiptment_storage) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "iSJ" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -9849,8 +9826,8 @@ /turf/simulated/floor/carpet/blucarpet, /area/space) "iTp" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -9873,12 +9850,13 @@ /turf/simulated/floor/wood, /area/space) "iUt" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/curtain/open/bed{ - anchored = 1; - name = "curtain" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/plating, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "iVr" = ( /obj/item/radio/intercom{ @@ -9920,20 +9898,18 @@ /turf/simulated/floor/plating, /area/space) "iWG" = ( -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, -/turf/simulated/floor/wood, +/turf/space, /area/crew_quarters/sleep/Dorm_1) "iWR" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/security/lobby) +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/gunbox/lethal, +/obj/item/gunbox/lethal, +/turf/simulated/floor/tiled/dark, +/area/space) "iXr" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/tiled/monotile, @@ -9955,10 +9931,8 @@ /turf/simulated/floor/tiled, /area/maintenance/bar/lower) "iYi" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/space, -/area/quartermaster/miningdock) +/turf/simulated/wall/r_wall/prepainted/security, +/area/hydroponics) "iYz" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -9972,10 +9946,13 @@ /turf/simulated/floor/wood, /area/quartermaster/foyer) "iYZ" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/closet/crate/bin{ + anchored = 1 }, -/obj/structure/cable/green, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "iZa" = ( @@ -10041,11 +10018,9 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "jas" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled, +/area/space) "jaC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10062,11 +10037,14 @@ /turf/simulated/floor/tiled, /area/security/lobby) "jaJ" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/bed/chair/comfy/teal{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/item/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/floor/wood, +/area/space) "jaY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -10111,15 +10089,12 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "jdy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/door/firedoor/glass{ - dir = 8 + icon_state = "1-2" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled/dark, /area/space) "jfm" = ( /obj/machinery/door/airlock/maintenance{ @@ -10138,14 +10113,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "jfT" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light, /turf/simulated/floor/tiled, -/area/security/range) +/area/space) "jhP" = ( /obj/machinery/vending/hydroseeds, /obj/effect/floor_decal/corner/green{ @@ -10154,41 +10124,13 @@ /turf/simulated/floor/tiled/dark, /area/space) "jhV" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/button/remote/blast_door{ - id = "armorytactical"; - name = "Tactical Armory Access"; - pixel_x = -25; - pixel_y = -6; - req_access = list(3) - }, -/obj/effect/floor_decal/corner/black/full{ - dir = 8 - }, -/obj/machinery/camera/network/security, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/table/rack/shelf/steel, -/obj/item/gun/ballistic/automatic/wt550{ - pixel_y = 7 - }, -/obj/item/gun/ballistic/automatic/wt550{ - pixel_y = -7 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/item/gun/ballistic/automatic/wt550, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, -/obj/item/ammo_magazine/a9mm/top_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/security/tactical) +/area/security/prison) "jiH" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -10248,11 +10190,19 @@ /turf/space, /area/space) "jjW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/area/security/prison) "jkC" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light/small{ @@ -10288,16 +10238,11 @@ /turf/simulated/wall/prepainted/civilian, /area/maintenance/dormitory) "jlu" = ( -/obj/structure/table/rack/shelf/steel, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/item/gunbox, -/obj/item/gunbox, -/obj/item/gunbox, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/space) "jlz" = ( /obj/structure/window/reinforced/tinted{ dir = 1 @@ -10332,11 +10277,13 @@ /turf/simulated/floor/wood, /area/hallway/primary/port) "joe" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/curtain/black{ - anchored = 1 +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/plating, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "joo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10377,13 +10324,13 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "jqp" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/obj/effect/floor_decal/techfloor{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/crew_quarters/bar) "jqw" = ( /obj/machinery/door/firedoor, @@ -10438,15 +10385,10 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "jsr" = ( -/obj/machinery/holopad, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/structure/table/steel, +/obj/machinery/microwave, +/turf/simulated/floor/tiled/monotile, +/area/space) "jsA" = ( /obj/random/trash_pile, /obj/machinery/light/small{ @@ -10497,22 +10439,21 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "juV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/table/woodentable, +/obj/item/radio/off{ + pixel_x = -7; + pixel_y = 2 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/megaphone{ + pixel_x = 5 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/item/radio/intercom/department/security{ + pixel_y = -24 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/security/hallway) "jvi" = ( /obj/structure/bed/chair/office/dark{ @@ -10521,20 +10462,8 @@ /turf/simulated/floor/tiled/monotile, /area/security/hallway) "jvm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/turf/space, +/area/crew_quarters/sleep/Dorm_9) "jvC" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -10626,8 +10555,22 @@ /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_2) "jAu" = ( -/turf/simulated/wall/prepainted/security, -/area/security/security_equiptment_storage) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass/security{ + layer = 2.8; + name = "Security Tool Storage"; + req_one_access = null + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/map_helper/access_helper/airlock/station/security/general, +/turf/simulated/floor/tiled/techfloor, +/area/security/hallway) "jBi" = ( /obj/structure/table/marble, /obj/structure/flora/pottedplant/small, @@ -10646,12 +10589,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "jCb" = ( -/obj/structure/closet/secure_closet/brig, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) +/obj/machinery/holopad, +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "jCl" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10686,12 +10626,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "jEE" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/tactical) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/maintenance/dormitory) "jFt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10747,13 +10689,12 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_7) "jGV" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/item/suit_cooling_unit, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/techfloor, +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled, +/area/space) "jIj" = ( /obj/machinery/camera/network/civilian, /turf/simulated/open, @@ -10769,12 +10710,19 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "jJg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "jJl" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -10825,12 +10773,22 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "jND" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/security_lockerroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "jNJ" = ( -/obj/structure/filingcabinet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/area/maintenance/bar/lower) "jOS" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -10877,14 +10835,11 @@ /turf/simulated/floor/plating, /area/space) "jPY" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/machinery/holopad, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled/monotile, /area/space) "jQb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -10899,11 +10854,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "jQq" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/structure/bed/chair/office/light, +/turf/simulated/floor/tiled/old_cargo/white, +/area/victory/surfacebase/tram) "jQV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -10915,8 +10868,16 @@ /turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "jRA" = ( -/turf/simulated/floor/tiled/dark, -/area/janitor) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/bed/chair/sofa/black/right, +/turf/simulated/floor/tiled, +/area/space) "jRS" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -10949,17 +10910,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "jSj" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/table/woodentable, -/obj/machinery/computer/security/telescreen{ - pixel_y = 32 +/obj/structure/closet/firecloset, +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "jSK" = ( /obj/machinery/power/apc/west_mount{ @@ -11076,15 +11031,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "jXq" = ( -/obj/machinery/button/remote/airlock{ - id = "dorm1"; - name = "Room 1 Lock"; - pixel_x = -26; - pixel_y = -4; - specialfunctions = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "jXs" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11172,14 +11122,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "kaY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 +/obj/structure/bed/chair/comfy/teal{ + dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -37 + }, +/turf/simulated/floor/wood, /area/maintenance/dormitory) "kaZ" = ( /obj/machinery/door/window/brigdoor/southleft{ @@ -11344,14 +11293,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "kdP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/space) "kep" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11369,11 +11319,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "kga" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/shuttle/wall/voidcraft/green, /area/victory/surfacebase/mining_main/eva) "kgv" = ( /obj/effect/floor_decal/techfloor, @@ -11403,17 +11349,9 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "khO" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/space) +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/showers) "kiW" = ( /obj/structure/ladder, /obj/structure/railing{ @@ -11487,9 +11425,17 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "klv" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/wall_frame/prepainted, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, /area/security/hallway) "kmn" = ( /obj/structure/table/bench/steel, @@ -11571,16 +11517,26 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "kqm" = ( -/obj/structure/cable/green{ +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/fire_alarm/west_mount{ +/obj/machinery/airlock_sensor{ + id_tag = "solar_sensor"; + pixel_x = 28; + pixel_y = -1 + }, +/obj/machinery/meter{ + frequency = 1443; + id = "dist_aux_meter"; + name = "Distribution Loop" + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "solar_dock"; pixel_x = -24 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/wood, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/recreation_area) "kqu" = ( /obj/machinery/atmospherics/portables_connector{ @@ -11590,7 +11546,16 @@ /turf/simulated/floor/plating, /area/space) "ksu" = ( -/turf/simulated/floor/tiled/old_cargo/white, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/space) "ksT" = ( /obj/structure/cable/green{ @@ -11611,14 +11576,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "ktS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled, +/area/space) "ktV" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -11687,10 +11650,9 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "kwx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/space) "kwP" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -11709,30 +11671,7 @@ /turf/simulated/floor/plating, /area/space) "kxm" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/door/airlock/glass/security{ - name = "Brig"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/dark, +/turf/simulated/wall/prepainted/security, /area/security/prison) "kxM" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -11783,11 +11722,23 @@ /turf/simulated/floor/plating, /area/space) "kzC" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armoryriot"; + name = "Emergency Armory Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/space) "kzJ" = ( /obj/item/tape_recorder{ pixel_x = -4; @@ -11805,14 +11756,13 @@ /turf/simulated/wall/r_wall, /area/space) "kAr" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/obj/structure/closet/crate, -/turf/simulated/floor/tiled/steel, -/area/space) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "kAJ" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -11838,11 +11788,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "kBd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/item/storage/secure/safe{ + pixel_y = -26 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/turf/simulated/floor/wood, +/area/security/hallway) "kBp" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) @@ -11910,18 +11860,7 @@ /turf/simulated/floor/tiled, /area/hydroponics) "kEu" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/mining{ - name = "Mining Airlock Storage"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/supply/cargo_bay, -/turf/simulated/floor/tiled, +/turf/space, /area/victory/surfacebase/mining_main/eva) "kEv" = ( /obj/structure/bookcase/legal/combo, @@ -11967,8 +11906,17 @@ /turf/simulated/floor/tiled/white, /area/station/stairs_two) "kFc" = ( -/turf/simulated/floor/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/prison/cell_block) "kFd" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -12013,21 +11961,29 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "kGo" = ( -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/space) "kGR" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/Dorm_11) "kHI" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -12076,13 +12032,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "kJd" = ( -/obj/item/stack/cable_coil/yellow, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/structure/table/rack, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/showers) "kKf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12098,15 +12056,10 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "kKj" = ( -/obj/structure/table/reinforced, -/obj/item/cell/high{ - maxcharge = 15000 - }, -/obj/item/cell/high{ - maxcharge = 15000 +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/space) "kKD" = ( /obj/machinery/fire_alarm/north_mount, @@ -12167,9 +12120,12 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "kOm" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central6, +/obj/structure/table/reinforced, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/microtaser, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, /turf/simulated/floor/tiled, -/area/security/range) +/area/security/prison) "kOv" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -12204,15 +12160,26 @@ /turf/simulated/floor/plating, /area/space) "kRt" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/random/plushie, -/obj/machinery/camera/network/security{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "kSb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/techfloor{ @@ -12253,8 +12220,7 @@ /turf/simulated/floor/plating, /area/hydroponics) "kWy" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/tiled/monotile, +/turf/space/basic, /area/quartermaster/qm) "kXU" = ( /obj/structure/table/steel, @@ -12287,18 +12253,14 @@ /turf/simulated/floor/tiled, /area/hydroponics) "kYq" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - docking_controller = "belter_docking"; - landmark_tag = "belter_station"; - name = "NSV Victory - Belter Shuttle" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/shuttle/plating/airless/carry, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/showers) "kYD" = ( /turf/simulated/floor/carpet, /area/space) @@ -12340,26 +12302,18 @@ /turf/simulated/floor/tiled/dark, /area/space) "laX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_1) "lbF" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/hallway/primary/port) "lbN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12367,22 +12321,26 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 }, -/obj/structure/sign/department/prison{ - pixel_y = 31 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/dark, -/area/space) +/turf/simulated/floor/tiled, +/area/victory/surfacebase/bar_backroom) "lcc" = ( -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/dark, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/security/prison) "lco" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12550,12 +12508,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "lhs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "lhA" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/effect/floor_decal/spline/plain{ @@ -12564,15 +12527,12 @@ /turf/simulated/floor/grass, /area/space) "lik" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/lobby) "liw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, +/obj/machinery/power/solar, +/obj/structure/cable/yellow, +/turf/simulated/floor/airless, /area/maintenance/dormitory) "liT" = ( /obj/structure/bed/chair/sofa, @@ -12582,20 +12542,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "ljQ" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - frequency = 1380; - id_tag = "mining_docker"; - pixel_y = 27; - tag_airpump = "civvie_vent"; - tag_chamber_sensor = "civvie_sensor"; - tag_exterior_door = "civvie_door_Ro"; - tag_exterior_sensor = "civvie_exterior_sensor"; - tag_interior_door = "civvie_door_Ri"; - tag_interior_sensor = "civvie_exp_psg" +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/tiled/steel, -/area/space) +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "lkB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -12631,96 +12582,16 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "llc" = ( -/obj/structure/table/rack/shelf/steel, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/legguards{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/clothing/accessory/armor/armguards, -/obj/item/clothing/accessory/armor/armguards, -/obj/item/clothing/accessory/armor/armguards, -/obj/item/clothing/accessory/armor/armguards, -/obj/item/clothing/accessory/armor/armguards, -/obj/item/clothing/accessory/armor/armguards, -/obj/item/clothing/accessory/armor/armguards{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/armor/armguards{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/armor/armguards{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/armor/armguards{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/armor/armguards{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/armor/armguards{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/armor/legguards/navy{ - pixel_x = -4; - pixel_y = -1 - }, -/obj/item/clothing/accessory/armor/legguards/navy{ - pixel_x = 7; - pixel_y = -1 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/item/clothing/accessory/armor/armguards/navy, -/obj/item/clothing/accessory/armor/armguards/navy, -/obj/item/clothing/accessory/armor/legguards/navy{ - pixel_x = -4; - pixel_y = -1 +/obj/structure/table/woodentable, +/obj/item/radio/intercom{ + pixel_y = -24 }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/item/instrument/trombone, +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "llw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12738,37 +12609,35 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_10) "llM" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/borderfloorblack{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/corner/red/border{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/security/prison) "llU" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/item/pen, -/obj/machinery/light/small, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/storage/box/flashshells, +/obj/item/storage/box/shotgunammo, +/obj/item/storage/box/shotgunshells{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/storage/box/shotgunshells{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/turf/simulated/floor/tiled/dark, /area/space) "lmE" = ( /obj/machinery/computer/security/wooden_tv, @@ -12779,8 +12648,7 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "lnq" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/tiled/white, +/turf/space, /area/crew_quarters/sleep/Dorm_11) "lox" = ( /obj/machinery/door/firedoor, @@ -12831,15 +12699,19 @@ /turf/space/basic, /area/crew_quarters/visitor_dining) "ltj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 22 }, -/obj/effect/floor_decal/corner/blue, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/space) "ltp" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -12890,16 +12762,17 @@ /turf/simulated/floor/tiled/techfloor, /area/security/lobby) "luI" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/item/suit_cooling_unit, -/obj/machinery/camera/network/engineering{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "luW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12911,15 +12784,17 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "lvf" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/space) +/area/crew_quarters/bar) "lvF" = ( /obj/machinery/status_display/supply_display{ pixel_y = 32 @@ -12930,27 +12805,22 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "lvY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, +/obj/structure/table/steel, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/corner/blue/full{ dir = 1 }, +/obj/machinery/camera/network/security, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/space) "lwk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -12964,30 +12834,36 @@ /turf/simulated/floor/tiled, /area/space) "lwl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/techfloor{ - dir = 9 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/white, +/area/space) "lwr" = ( /obj/structure/kitchenspike, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "lwy" = ( -/obj/machinery/light{ +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block) "lxo" = ( /turf/simulated/wall/prepainted/security, /area/security/security_processing) @@ -13009,25 +12885,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/qm) "lxM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/security/lobby) +/turf/simulated/floor/tiled, +/area/space) "lyu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -13103,12 +12966,9 @@ /turf/simulated/floor/tiled/dark, /area/space) "lAc" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/range) +/obj/structure/undies_wardrobe, +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "lAk" = ( /obj/structure/table/woodentable, /obj/item/handcuffs/fuzzy, @@ -13125,13 +12985,16 @@ /area/crew_quarters/sleep/Dorm_3) "lAA" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/area/space) "lAR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -13165,8 +13028,9 @@ /turf/simulated/floor/tiled, /area/security/lobby) "lCa" = ( -/obj/structure/sign/department/eva, -/turf/simulated/wall/prepainted, +/obj/machinery/power/solar, +/obj/structure/cable/yellow, +/turf/simulated/floor/airless, /area/crew_quarters/recreation_area) "lCr" = ( /obj/structure/cable/green{ @@ -13214,22 +13078,16 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "lDQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/closet/l3closet/security, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/space) "lDR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -13366,22 +13224,52 @@ /turf/simulated/floor/plating, /area/space) "lJy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -26 +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/Dorm_1) +"lJV" = ( +/obj/machinery/light, +/obj/effect/floor_decal/corner/black/full{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 5 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) -"lJV" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/item/clothing/head/helmet/combat{ + pixel_x = -5; + pixel_y = -7 }, -/obj/structure/undies_wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/clothing/head/helmet/combat{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/shield/riot/tower/swat{ + pixel_x = 4 + }, +/obj/item/shield/riot/tower/swat{ + pixel_x = 4 + }, +/obj/item/shield/riot/tower/swat{ + pixel_x = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "lKc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13423,22 +13311,14 @@ /turf/space, /area/space) "lKT" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/lino, -/area/space) +/turf/simulated/floor/carpet/bcarpet, +/area/maintenance/dormitory) "lLf" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/security{ - name = "Interrogation view room"; - req_access = list(); - req_one_access = null + icon_state = "4-8" }, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/dark, -/area/security/interrogation) +/turf/simulated/shuttle/wall/voidcraft/green, +/area/victory/surfacebase/mining_main/eva) "lLB" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -13451,18 +13331,15 @@ /obj/machinery/door/airlock, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"lMN" = ( -/obj/structure/table/steel, -/obj/random/drinkbottle, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) "lNi" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/structure/closet/wardrobe, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/space) "lNn" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -13483,17 +13360,66 @@ /turf/simulated/floor/plating, /area/space) "lOP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/black/full, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/armor/armorplate/heavy{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/heavy{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/heavy{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/ballistic{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/ballistic{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/ballistic{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/combat{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/combat{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/combat{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/accessory/armor/armorplate/tactical{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/tactical{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/armorplate/tactical{ + pixel_x = 5; + pixel_y = -3 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/space) "lPe" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -13507,8 +13433,23 @@ /turf/simulated/floor/tiled/steel, /area/space) "lQH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, -/area/security/range) +/area/crew_quarters/bar) "lSh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13607,17 +13548,14 @@ /turf/simulated/floor/plating, /area/space) "lYh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/button/remote/airlock{ - id = "dorm11"; - name = "Room 11 Lock"; - pixel_x = -26; - pixel_y = -4; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "lYO" = ( /obj/structure/bed/chair{ @@ -13633,20 +13571,19 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "lYT" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/security/range) +/obj/structure/table/reinforced, +/obj/item/forensics/sample_kit/powder, +/turf/simulated/floor/tiled/old_cargo/white, +/area/crew_quarters/heads/hos) "lZw" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/flasher/portable, +/obj/machinery/light, +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_9) +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/space) "lZK" = ( /obj/structure/railing{ dir = 1 @@ -13717,11 +13654,12 @@ /turf/simulated/floor/wood, /area/maintenance/bar/lower) "men" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "mew" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13752,18 +13690,18 @@ /turf/simulated/floor/tiled, /area/space) "mft" = ( -/obj/effect/floor_decal/techfloor{ - dir = 10 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted/security, /area/crew_quarters/bar) "mfU" = ( +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, +/obj/machinery/door/airlock/glass/security{ + name = "Cell Block"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, /area/security/hallway) "mfY" = ( @@ -13853,7 +13791,16 @@ /turf/simulated/wall/r_wall/prepainted/security, /area/crew_quarters/heads/hos) "mkJ" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/airless, /area/maintenance/dormitory) "mlp" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -13862,25 +13809,11 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "mlr" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/woodentable, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/item/instrument/trombone, -/turf/simulated/floor/wood, +/obj/structure/lattice, +/turf/space, /area/crew_quarters/sleep/Dorm_1) "mlW" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/sleep/Dorm_11) "mmr" = ( /obj/effect/floor_decal/techfloor{ @@ -13940,26 +13873,18 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "mof" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/landmark/spawnpoint/job/janitor, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/obj/structure/table/woodentable, +/obj/item/reagent_scanner, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/wood, +/area/space) "mow" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 +/obj/structure/closet{ + name = "Evidence Closet" }, -/turf/simulated/floor/carpet/blucarpet, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/victory/surfacebase/tram) "mox" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass/mining{ @@ -13975,26 +13900,33 @@ /turf/simulated/floor/tiled/dark, /area/space) "moT" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/space) "mps" = ( /turf/simulated/wall/prepainted, /area/maintenance/dormitory) "mpF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -26 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -14023,9 +13955,11 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/victory/surfacebase/mining_main/refinery) "mrE" = ( -/obj/structure/closet/l3closet/janitor, +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/maintenance/bar/lower) "mrG" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14071,11 +14005,18 @@ /turf/simulated/floor/tiled/monotile, /area/space) "muz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/effect/floor_decal/corner/red/full{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/victory/surfacebase/mining_main/eva) +/obj/structure/table/steel, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/camera/network/security, +/turf/simulated/floor/tiled/dark, +/area/space) "muD" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/door/firedoor{ @@ -14107,14 +14048,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) -"mxd" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) "mxz" = ( /obj/machinery/door/airlock/maintenance/sec{ req_one_access = null @@ -14199,16 +14132,11 @@ /turf/simulated/floor/plating, /area/space) "mDr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/effect/floor_decal/techfloor, -/obj/structure/bed/chair/sofa/black/right, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/old_cargo/white, +/area/victory/surfacebase/tram) "mDw" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -14217,15 +14145,18 @@ /turf/simulated/floor/tiled/white, /area/station/stairs_two) "mDS" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled, /area/space) "mDW" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled, +/area/maintenance/dormitory) "mEE" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -14244,14 +14175,13 @@ /turf/simulated/floor/wood, /area/maintenance/bar/lower) "mEN" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/toilet) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "mEP" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -14270,16 +14200,16 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "mFZ" = ( -/obj/machinery/papershredder, -/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "4-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 8 +/obj/machinery/atmospherics/portables_connector{ + dir = 1; + name = "Engine Fuel Port" }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "mGr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14291,30 +14221,20 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "mGz" = ( -/obj/structure/table/steel, -/obj/machinery/chemical_dispenser/catering/bar_soft, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/structure/closet/secure_closet/brig, +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/barrestroom) "mGW" = ( -/obj/structure/table/rack/steel, -/obj/structure/window/reinforced, -/obj/machinery/light, -/obj/effect/floor_decal/corner/red{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/outline/red, /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 10 +/obj/machinery/suit_storage_unit/standard_unit, +/obj/item/suit_cooling_unit, +/obj/machinery/camera/network/engineering{ + dir = 4 }, -/obj/item/storage/toolbox/syndicate, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/Dorm_1) "mHd" = ( /turf/simulated/floor/tiled, /area/quartermaster/foyer) @@ -14355,23 +14275,20 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "mIH" = ( -/turf/simulated/wall/prepainted, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "mJk" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/riot_control) +/obj/structure/bed/double/padded, +/obj/random/bedsheet/double, +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "mJI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/lino, +/area/security/detectives_office) "mJM" = ( /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall/prepainted/civilian, @@ -14387,10 +14304,12 @@ /area/crew_quarters/recreation_area) "mKC" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/airless, -/area/space) +/obj/effect/shuttle_landmark/victory/deck2/mining, +/obj/overmap/entity/visitable/ship/landable/mining/victory, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "mKY" = ( /obj/machinery/air_alarm{ dir = 4; @@ -14411,11 +14330,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/prison/cell_block) "mMB" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled/steel, @@ -14496,13 +14419,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "mPi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/structure/railing{ + dir = 1 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled, +/area/space) "mPD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -14523,20 +14444,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "mPV" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/techfloor{ dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled, +/area/space) "mQm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14581,39 +14496,12 @@ /turf/simulated/floor/tiled, /area/security/lobby) "mRe" = ( -/obj/structure/table/woodentable, -/obj/item/clothing/accessory/permit/gun, -/obj/item/clothing/accessory/permit/gun, -/obj/item/clothing/accessory/permit/gun, -/obj/item/clothing/accessory/permit/gun, -/obj/item/clothing/accessory/permit/gun, -/obj/item/paper{ - desc = ""; - info = "In the event that more weapon permits are needed, please fax Central Command to request more. Please also include a reason for the request. Blank permits will be shipped to cargo for pickup. If long-term permits are desired, please contact your Nanotrasen Employee Representitive for more information."; - name = "note from CentCom about permits" - }, -/obj/machinery/camera/network/security{ - dir = 1 - }, -/obj/item/clothing/accessory/permit/gun{ - desc = "An example of a card indicating that the owner is allowed to carry a firearm. There's a note saying to fax CentCom if you want to order more blank permits."; - name = "sample weapon permit"; - owner = 1; - pixel_y = 10 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) -"mRS" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Restroom" }, -/obj/structure/closet/jcloset, -/obj/random/soap, -/obj/item/mop, -/obj/item/storage/bag/trash, -/obj/item/lightreplacer, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/turf/simulated/floor/tiled, +/area/space) "mSf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14629,14 +14517,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "mSY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "mTI" = ( /obj/structure/bed/padded, /obj/random/bedsheet, @@ -14689,7 +14574,9 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "mWM" = ( -/turf/space/basic, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, /area/victory/surfacebase/tram) "mXS" = ( /obj/machinery/door/airlock/glass, @@ -14750,58 +14637,12 @@ /turf/simulated/floor/tiled, /area/security/lobby) "ndA" = ( -/obj/structure/table/rack/shelf/steel, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/item/clothing/accessory/storage/pouches/large{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/pouches/large{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/pouches/large{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/pouches/large{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/pouches/large{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/pouches/large{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/pouches{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/clothing/accessory/storage/pouches{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/clothing/accessory/storage/pouches{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/clothing/accessory/storage/pouches{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/clothing/accessory/storage/pouches{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/clothing/accessory/storage/pouches{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/clothing/accessory/storage/pouches/large/navy{ - pixel_y = 3 - }, -/obj/item/clothing/accessory/storage/pouches/large/navy{ - pixel_y = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/structure/table/reinforced, +/obj/item/reagent_containers/spray/luminol, +/obj/item/uv_light, +/obj/machinery/light, +/turf/simulated/floor/tiled/old_cargo/white, +/area/crew_quarters/heads/hos) "nes" = ( /turf/simulated/wall/prepainted/civilian, /area/vacant/vacant_shop) @@ -14839,22 +14680,15 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) "nfV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" + dir = 5 }, -/obj/machinery/door/airlock{ - name = "Bar Backroom" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/map_helper/access_helper/airlock/station/service/bar, -/turf/simulated/floor/wood, -/area/victory/surfacebase/bar_backroom) +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled, +/area/space) "ngv" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -14888,12 +14722,16 @@ /turf/simulated/floor/wood, /area/space) "nhk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/reagent_dispensers/water_cooler, +/obj/item/reagent_containers/glass/cooler_bottle, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_1) +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "nhD" = ( /obj/machinery/shower{ dir = 1 @@ -14908,11 +14746,20 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "niA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "solar_pump" }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/crew_quarters/recreation_area) "nji" = ( /obj/machinery/computer/shuttle_control/belter{ dir = 4 @@ -14933,31 +14780,27 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "njR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/toilet{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/hallway) +"nkn" = ( +/obj/structure/bed/chair{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/techfloor, +/obj/machinery/status_display{ + pixel_y = -32 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) -"nkn" = ( -/obj/structure/ladder/up, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled, +/area/prison/cell_block) "nkM" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -31 @@ -14977,11 +14820,11 @@ /turf/simulated/floor/tiled, /area/security/lobby) "nlt" = ( -/obj/structure/toilet{ - pixel_y = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "nlO" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -14998,14 +14841,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "nnD" = ( -/obj/machinery/door/window/northleft{ - dir = 4 - }, /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/security/security_lockerroom) +/area/space) "nnO" = ( /obj/item/stool/padded, /obj/effect/floor_decal/corner_oldtile/white/diagonal, @@ -15042,11 +14885,11 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "noF" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "noJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15074,32 +14917,18 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "npR" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/shuttle/engine/propulsion{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass/security{ - layer = 2.8; - name = "Security"; - req_one_access = null +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "belter_docking"; + landmark_tag = "belter_station"; + name = "NSV Victory - Belter Shuttle" }, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/belter) "nqS" = ( /turf/simulated/floor/tiled/techmaint, /area/quartermaster/office) @@ -15150,35 +14979,22 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "nti" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/obj/structure/filingcabinet, +/turf/simulated/floor/wood, +/area/security/hallway) "ntA" = ( -/obj/structure/table/steel, -/obj/item/reagent_containers/food/drinks/drinkingglass/soda, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/space) "ntG" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379; - id_tag = "mining_fore_pump" +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 +/obj/machinery/power/terminal, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/airless, /area/victory/surfacebase/mining_main/eva) "ntN" = ( /obj/machinery/fire_alarm/south_mount{ @@ -15217,12 +15033,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "nvw" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 8 +/obj/machinery/power/solar_control, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/sleep/Dorm_8) "nvC" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled/techfloor, @@ -15236,16 +15052,6 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) -"nxt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/table/rack/shelf/steel, -/obj/item/melee/baton/loaded, -/obj/item/melee/baton/loaded, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) "nxu" = ( /obj/effect/floor_decal/industrial/danger{ dir = 9 @@ -15338,23 +15144,24 @@ /turf/simulated/floor/tiled/old_tile/white, /area/space) "nDp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/effect/floor_decal/techfloor{ + dir = 9 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/space) "nEU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/security{ - name = "Security Restroom"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/security/department, -/turf/simulated/floor/tiled/white, -/area/space) +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/lino, +/area/security/detectives_office) "nFa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -15362,24 +15169,13 @@ /turf/simulated/floor/tiled/dark, /area/space) "nFF" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass/security{ - name = "Permanent Confinement"; - req_one_access = null +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/map_helper/access_helper/airlock/station/security/department, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, /area/space) "nFR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -15415,13 +15211,15 @@ /turf/space/basic, /area/security/security_lockerroom) "nHw" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 +/obj/structure/sink{ + pixel_y = 22 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/mirror{ + dir = 4; + pixel_y = 33 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, /area/space) "nHK" = ( /obj/effect/floor_decal/borderfloor, @@ -15434,7 +15232,11 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "nIh" = ( -/turf/simulated/floor/carpet/purcarpet, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_9) "nIS" = ( /obj/machinery/light{ @@ -15447,16 +15249,18 @@ /turf/simulated/floor/carpet/bcarpet, /area/space) "nJr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/goggles, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/door/firedoor, +/obj/item/gun/energy/laser/practice, +/obj/machinery/light_switch{ + pixel_y = -26 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/tiled/old_tile/gray, /area/space) "nJt" = ( /obj/effect/floor_decal/borderfloor{ @@ -15508,13 +15312,32 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/uxstorage) "nLo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "mining_fore_pump" +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/tiled, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/airlock/glass/security{ + layer = 2.8; + name = "Security"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/general, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "nLK" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -15595,34 +15418,36 @@ /turf/simulated/floor/tiled/white, /area/station/stairs_two) "nPz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/toilet) +/obj/machinery/door/airlock{ + id_tag = "dorm8"; + name = "Dorm 8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/space) "nPK" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "mining_fore_airlock"; - pixel_y = -26; - tag_airpump = "mining_fore_pump"; - tag_chamber_sensor = "mining_fore_sensor"; - tag_exterior_door = "mining_fore_outer"; - tag_interior_door = "mining_fore_inner" +/obj/structure/closet/hydrant{ + pixel_y = 30 }, -/obj/machinery/light, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379; - id_tag = "mining_fore_pump" +/obj/item/gun/ballistic/shotgun/flare, +/obj/item/storage/box/flashshells, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 }, -/turf/simulated/floor/tiled, +/obj/machinery/meter, +/obj/item/duct_tape_roll, +/turf/simulated/floor/airless, /area/victory/surfacebase/mining_main/eva) "nQt" = ( /obj/structure/cable/green{ @@ -15776,13 +15601,12 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "nUt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/landmark/spawnpoint/job/janitor, +/turf/simulated/floor/tiled/dark, +/area/maintenance/bar/lower) "nUA" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/watertank, @@ -15832,21 +15656,28 @@ /turf/simulated/wall/prepainted/cargo, /area/victory/surfacebase/mining_main/storage) "nWy" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/space) -"nWO" = ( -/obj/machinery/door/window/brigdoor/westright{ - dir = 4; - name = "Firing Range Door" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/turf/simulated/floor/wood, +/area/maintenance/dormitory) +"nWO" = ( +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/item/gunbox, +/obj/item/gunbox, +/obj/item/gunbox, +/turf/simulated/floor/tiled/dark, +/area/space) "nWR" = ( /obj/machinery/fire_alarm/east_mount, /obj/structure/closet/wardrobe, @@ -15902,22 +15733,21 @@ /turf/simulated/floor/plating, /area/space) "nYY" = ( -/obj/machinery/atmospherics/component/unary/engine{ - dir = 8 +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/turf/simulated/shuttle/plating/airless/carry, +/turf/simulated/floor/wood, /area/space) "nZs" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/effect/floor_decal/corner/red/border{ + dir = 4 }, -/obj/machinery/mech_recharger, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/space) "nZO" = ( /turf/simulated/floor/tiled, /area/quartermaster/office) @@ -16039,21 +15869,14 @@ /area/space) "oeM" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/security{ - layer = 2.8; - name = "Security Tool Storage"; - req_one_access = null - }, /obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 + dir = 4; + id = "armorylight"; + name = "Light Armory Acccess" }, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/techfloor, -/area/security/lobby) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/space) "oeN" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -16061,11 +15884,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "ofb" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/landmark/spawnpoint/job/janitor, -/turf/simulated/floor/tiled/dark, +/turf/space/basic, /area/janitor) "ofd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16089,38 +15908,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "ogj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock{ - id_tag = "dorm9"; - name = "Dorm 9" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/structure/ladder, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_9) "ogo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/chair/comfy/beige{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/turf/simulated/floor/tiled/monotile, +/area/space) "ohJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; @@ -16133,13 +15929,20 @@ /turf/simulated/floor/plating, /area/space) "ohZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor, +/obj/machinery/door/airlock/glass/security{ + name = "Confinement Processing"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/department, /turf/simulated/floor/tiled, /area/crew_quarters/bar) "oio" = ( @@ -16181,10 +15984,16 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "okB" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/structure/window/reinforced/tinted{ + dir = 1 }, -/turf/simulated/floor/wood, +/obj/machinery/vending/sovietsoda{ + name = "Water Dispenser" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "olj" = ( /obj/machinery/recharger/wallcharger{ @@ -16204,30 +16013,45 @@ /turf/simulated/floor/tiled/dark, /area/space) "olR" = ( -/obj/structure/sink{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_1) +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "omd" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-4" }, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/space) "omy" = ( /obj/structure/lattice, /obj/structure/grille, /turf/space, /area/space) "onm" = ( -/obj/structure/closet/secure_closet/brig, -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/wood, +/area/maintenance/bar/lower) "ooh" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable{ @@ -16242,14 +16066,13 @@ /turf/simulated/floor/crystal, /area/station/stairs_two) "ooC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/shuttle/engine/heater{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor/tiled, +/turf/simulated/shuttle/wall/voidcraft/green, /area/quartermaster/miningdock) "oph" = ( /obj/item/radio/intercom{ @@ -16274,12 +16097,14 @@ /turf/simulated/floor/wood, /area/space) "oqR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, -/area/security/prison) +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/space) "oqT" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled/monotile, @@ -16358,15 +16183,18 @@ /turf/simulated/floor/tiled/steel, /area/space) "owH" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" }, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/green{ + icon_state = "0-2" }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/structure/wall_frame/prepainted, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/security/hallway) "oxp" = ( /obj/structure/closet/secure_closet/cargotech, /obj/machinery/fire_alarm/south_mount{ @@ -16458,17 +16286,8 @@ /turf/simulated/floor/plating, /area/quartermaster/qm) "oEg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/space, +/area/security/brig) "oEA" = ( /turf/space, /area/quartermaster/warehouse) @@ -16541,15 +16360,14 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "oHn" = ( -/obj/effect/floor_decal/corner/white/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/dnaforensics, -/obj/machinery/camera/network/security{ +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "oIU" = ( /obj/structure/bed/chair/shuttle, /obj/structure/closet/walllocker/emerglocker/north, @@ -16576,13 +16394,14 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "oKB" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 }, -/obj/structure/table/steel_reinforced, -/obj/machinery/cell_charger, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/turf/simulated/floor/tiled/dark, +/area/space) "oMz" = ( /obj/structure/table/reinforced, /obj/item/pen{ @@ -16689,17 +16508,24 @@ /turf/simulated/floor/wood, /area/space) "oPw" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/crew_quarters/bar) "oPO" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/holopad, +/obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/old_cargo/white, +/area/security/detectives_office) "oPY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16739,29 +16565,52 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/port) "oQH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, +/obj/machinery/door/airlock/security{ + name = "Interrogation view room"; + req_access = list(); + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, /area/security/hallway) "oQS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/door/airlock/glass/security{ + name = "Brig"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/area/space) "oQW" = ( -/obj/structure/bed/chair{ +/obj/machinery/camera/network/security{ dir = 1 }, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/interrogation) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/space) "oRa" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/voidcraft{ @@ -16811,13 +16660,16 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "oSG" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/computer/ship/helm{ + dir = 4 + }, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; + gps_tag = "SHUTTLE"; + name = "shuttle beacon" }, -/obj/effect/shuttle_landmark/victory/deck2/mining, -/obj/overmap/entity/visitable/ship/landable/mining/victory, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/belter) "oSN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, @@ -16834,16 +16686,16 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "oTE" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/structure/table/rack/shelf/steel, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/item/gun/energy/gun, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, +/area/space) "oTU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -16871,22 +16723,16 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "oUt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"oVt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/maintenance, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) -"oVt" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/white, /area/maintenance/dormitory) "oWR" = ( /obj/structure/cable/green{ @@ -16975,29 +16821,33 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "paJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "pbp" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/door/airlock{ - name = "Restroom" + name = "Bathroom" + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/bar) +/area/maintenance/dormitory) "pbu" = ( /obj/machinery/door/airlock/highsecurity{ name = "High Security Lockup"; @@ -17032,14 +16882,17 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/space) "pcp" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/structure/table/woodentable, +/obj/machinery/reagentgrinder, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/packageWrap, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/machinery/light_switch{ + pixel_x = -9; + pixel_y = 30 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/wood, +/area/space) "pcq" = ( /obj/machinery/newscaster/security_unit{ pixel_x = -32 @@ -17110,19 +16963,22 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "pgA" = ( -/obj/machinery/light, -/obj/machinery/computer/arcade, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/camera/network/civilian{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/space) "pgF" = ( /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/dark, /area/space) "pgN" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 }, -/turf/simulated/floor/lino, +/obj/structure/table/steel_reinforced, +/obj/machinery/cell_charger, +/turf/simulated/floor/tiled/old_tile/gray, /area/space) "phF" = ( /obj/structure/table/standard, @@ -17148,22 +17004,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "pin" = ( -/obj/structure/table/woodentable, -/obj/item/radio/off{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/megaphone{ - pixel_x = 5 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/item/radio/intercom/department/security{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/turf/simulated/floor/carpet/purcarpet, +/area/space) "piI" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -17227,8 +17078,16 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "plg" = ( -/turf/space/basic, -/area/crew_quarters/heads/hos) +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/flora/pottedplant/smalltree, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "pls" = ( /obj/item/radio/intercom{ dir = 1; @@ -17254,17 +17113,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "pmq" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass{ - name = "Bar" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/machinery/holopad, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/hallway) "pmz" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_5) @@ -17281,21 +17132,20 @@ /area/crew_quarters/heads/hos) "pnI" = ( /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/portables_connector{ - dir = 1; - name = "Engine Fuel Port" + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/steel, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, /area/space) "pnJ" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 4 +/obj/effect/floor_decal/corner/red{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/tiled/dark, +/area/space) "poB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -17375,13 +17225,17 @@ /turf/simulated/floor/tiled/techfloor, /area/security/lobby) "ptH" = ( -/obj/machinery/atmospherics/pipe/tank/phoron{ - dir = 1; - volume = 20000 +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/airless, -/area/space) +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/security/detectives_office) "ptY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17431,19 +17285,10 @@ }, /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) -"pAI" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) "pAN" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) +/obj/machinery/camera/network/outside, +/turf/space, +/area/security/brig) "pBd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -17451,15 +17296,14 @@ /turf/simulated/floor/tiled, /area/space) "pBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/techfloor{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled, +/area/space) "pBU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17484,10 +17328,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "pDg" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/sterile/latex, -/obj/item/reagent_containers/syringe, -/turf/simulated/floor/tiled/old_cargo/white, +/obj/structure/table/steel, +/obj/item/storage/box/donkpockets, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/machinery/vending/wallmed1{ + name = "Emergency NanoMed"; + pixel_y = 32 + }, +/obj/machinery/camera/network/security{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, /area/space) "pEa" = ( /obj/effect/floor_decal/industrial/danger{ @@ -17501,7 +17355,8 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/space) "pEA" = ( -/turf/simulated/floor/tiled/white, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "pEY" = ( /obj/landmark/spawnpoint/job/quartermaster, @@ -17519,14 +17374,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "pFn" = ( -/obj/machinery/door/window/eastleft{ - dir = 8 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled/monotile, -/area/space) +/area/hallway/primary/port) "pFM" = ( /obj/machinery/appliance/mixer/candy, /obj/effect/floor_decal/corner_oldtile/white/diagonal, @@ -17602,22 +17457,14 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "pIG" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/obj/structure/table/rack/shelf/steel, -/obj/item/ammo_magazine/a7_62mm, -/obj/item/ammo_magazine/a7_62mm, -/obj/item/gun/ballistic/automatic/z8, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/light{ - dir = 4 +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -37 }, -/turf/simulated/floor/tiled/dark, -/area/security/tactical) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "pIJ" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -17625,14 +17472,6 @@ /obj/machinery/scale, /turf/simulated/floor/wood, /area/space) -"pJy" = ( -/obj/effect/floor_decal/techfloor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/dogbed, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) "pJB" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -17651,28 +17490,13 @@ /turf/simulated/floor/tiled/dark, /area/space) "pJR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/closet/wardrobe, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/power/apc/west_mount, -/turf/simulated/floor/tiled/dark, -/area/prison/cell_block) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "pKn" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -17682,11 +17506,13 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "pLv" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/heads/hos) "pLG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -17786,18 +17612,8 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "pPr" = ( -/obj/structure/bed/padded, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -2; - pixel_y = -28 - }, -/obj/random/bedsheet, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/turf/space/basic, +/area/vacant/vacant_shop) "pPT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17820,16 +17636,16 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "pRw" = ( -/obj/machinery/door/airlock/voidcraft{ - frequency = 2020; - id_tag = "belt_shuttle_exterior" +/obj/machinery/door/firedoor{ + dir = 4 }, -/obj/structure/fans/tiny, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/green{ + icon_state = "0-8" }, -/turf/simulated/floor/tiled/steel, -/area/space) +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/victory/surfacebase/tram) "pRI" = ( /obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor/plating, @@ -17838,12 +17654,15 @@ /turf/simulated/wall/prepainted/security, /area/security/lobby) "pRV" = ( -/obj/machinery/camera/network/prison, -/obj/structure/table/reinforced, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, -/turf/simulated/floor/tiled, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/space) "pSh" = ( /obj/structure/sink/kitchen{ @@ -17893,10 +17712,25 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "pWA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark, /area/space) "pWM" = ( /obj/machinery/camera/network/security{ @@ -17907,14 +17741,12 @@ /turf/simulated/floor/tiled/dark, /area/space) "pXB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/door/airlock{ + name = "Cyborg Recharging"; + id_tag = "bartoliet1" }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/white, +/area/space) "pXH" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -17922,16 +17754,14 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "pXI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/carpet/purcarpet, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "pXS" = ( /obj/effect/floor_decal/techfloor{ @@ -17949,17 +17779,24 @@ /turf/simulated/floor/tiled/dark, /area/space) "pZd" = ( -/obj/machinery/door/firedoor, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ - name = "Custodial Closet" + id_tag = "dorm10"; + name = "Dorm 1" }, -/obj/map_helper/access_helper/airlock/station/service/janitor, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "pZp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18000,9 +17837,16 @@ /turf/simulated/floor/wood, /area/space) "qaD" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/security/range) +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/door/airlock/glass/security{ + name = "Solitary Confinement 1"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/brig, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "qaF" = ( /obj/machinery/computer/security{ dir = 8 @@ -18195,39 +18039,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "qkT" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/security/hallway) "qkX" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/security{ - name = "Firing Range"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/security/department, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/space) "qll" = ( /obj/machinery/light_switch{ pixel_x = -25 @@ -18247,14 +18072,11 @@ /turf/simulated/floor/tiled, /area/hydroponics) "qmt" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/structure/bed/chair{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/turf/simulated/floor/tiled/monotile, +/area/victory/surfacebase/bar_backroom) "qmI" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -18313,31 +18135,43 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "qqu" = ( -/obj/structure/railing, -/turf/space, -/area/space) +/obj/structure/janitorialcart, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled/dark, +/area/maintenance/bar/lower) "qqz" = ( -/obj/machinery/suit_cycler/security, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/structure/mirror{ + pixel_x = -28 + }, +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "qqB" = ( -/turf/simulated/floor/tiled, -/area/security/range) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "qqC" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "qqM" = ( +/obj/structure/table/rack/shelf/steel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/effect/floor_decal/industrial/outline/blue, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/turf/simulated/floor/tiled/dark, +/area/space) "qrg" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18372,11 +18206,26 @@ /turf/simulated/floor, /area/space) "qsd" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/interrogation) +/obj/machinery/dnaforensics, +/turf/simulated/floor/tiled/old_cargo/white, +/area/victory/surfacebase/tram) "qsz" = ( -/turf/simulated/wall/r_wall/prepainted/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/security/armoury) "qsC" = ( /obj/structure/cable/green{ @@ -18431,10 +18280,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_7) "quT" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 4 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_6) "qvt" = ( /obj/machinery/door/firedoor, @@ -18456,25 +18302,32 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) "qwv" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/structure/table/rack/shelf/steel, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = -5; + pixel_y = -2 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = -5; + pixel_y = -2 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = 5; + pixel_y = -2 }, -/obj/machinery/door/airlock/glass/security{ - name = "Firing Range"; - req_one_access = null +/obj/item/clothing/suit/armor/pcarrier/ballistic{ + pixel_x = 5; + pixel_y = -2 }, -/obj/map_helper/access_helper/airlock/station/security/department, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "qxm" = ( /obj/machinery/vending/dinnerware, /obj/effect/floor_decal/corner_oldtile/white/diagonal, @@ -18564,13 +18417,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "qCU" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled, +/area/space) "qDC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18589,17 +18440,22 @@ /turf/simulated/floor/plating, /area/space) "qEJ" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 8 +/obj/structure/table/rack/steel, +/obj/structure/window/reinforced, +/obj/machinery/light, +/obj/effect/floor_decal/corner/red{ + dir = 10 }, -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 +/obj/effect/floor_decal/corner/red{ + dir = 10 }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/item/storage/toolbox/syndicate, +/turf/simulated/floor/tiled/dark, +/area/space) "qFq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -18638,14 +18494,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "qGM" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, +/turf/simulated/floor/airless, /area/crew_quarters/recreation_area) "qHl" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -18666,27 +18518,19 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "qHu" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled, +/turf/simulated/wall/r_wall/prepainted/security, /area/crew_quarters/bar) "qIi" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/mask/gas, -/obj/item/tool/crowbar, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "qIv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/suit_cycler/security, +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_1) +/turf/simulated/floor/tiled, +/area/security/prison) "qJl" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -18774,23 +18618,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qLQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/structure/closet/bombclosetsecurity, +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/space) @@ -18833,15 +18663,11 @@ /turf/simulated/floor/plating, /area/space) "qOX" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/obj/structure/filingcabinet/tall, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/turf/simulated/floor/carpet/bcarpet, +/area/maintenance/dormitory) "qPa" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -18857,14 +18683,21 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) "qQj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/button/remote/blast_door{ + id = "armoryriot"; + name = "Emergency Armory Access"; + pixel_x = -25; + pixel_y = -6; + req_access = list(3) }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/red{ + dir = 9 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_1) +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "qQk" = ( /obj/structure/table/marble, /obj/effect/floor_decal/spline/fancy/wood{ @@ -18880,27 +18713,13 @@ /turf/simulated/floor/plating, /area/space) "qQr" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/machinery/shower{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/structure/curtain/open/shower/engineering, -/turf/simulated/floor/tiled, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_1) "qQK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -18925,8 +18744,7 @@ /turf/simulated/floor/tiled, /area/space) "qRL" = ( -/obj/machinery/shield_diffuser, -/turf/simulated/floor/airless/ceiling, +/turf/simulated/wall/r_wall/prepainted/security, /area/bridge) "qSI" = ( /obj/machinery/light_switch{ @@ -18936,42 +18754,36 @@ /turf/simulated/floor/tiled, /area/space) "qTf" = ( -/obj/structure/closet/crate, -/obj/item/target, -/obj/item/target, -/obj/item/target, -/obj/item/target, -/obj/item/target, -/obj/item/target, -/obj/item/target, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/landmark/spawnpoint/job/janitor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/space) "qTR" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/machinery/computer/arcade, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, /area/crew_quarters/bar) "qUa" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/bed/chair/comfy/beige{ + dir = 8 }, -/obj/effect/floor_decal/techfloor{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 +/obj/machinery/ai_status_display{ + pixel_y = 32 }, /turf/simulated/floor/tiled/monotile, -/area/security/lobby) +/area/space) "qUi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18993,14 +18805,15 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "qVB" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar Farm - SMES 1" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/glass_external{ + req_one_access = null }, /turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/area/crew_quarters/recreation_area) "qWf" = ( /obj/machinery/shower{ dir = 8 @@ -19008,12 +18821,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "qWi" = ( -/obj/effect/floor_decal/techfloor{ - dir = 5 - }, -/obj/structure/closet/firecloset, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/space, +/area/shuttle/belter) "qWI" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -19082,35 +18891,33 @@ /turf/simulated/floor/tiled/monotile, /area/space) "rbk" = ( -/obj/machinery/holopad, -/obj/machinery/camera/network/security{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/suit_storage_unit/standard_unit, +/obj/item/suit_cooling_unit, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/Dorm_1) "rbz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hydroponics) "rck" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/structure/mirror{ + pixel_x = -28 }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "0-4" }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/turf/simulated/floor/tiled/white, +/area/space) "rcQ" = ( /obj/structure/bed/chair/comfy/teal{ dir = 1 @@ -19135,27 +18942,14 @@ /turf/simulated/floor/tiled, /area/space) "rdy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/camera/network/security, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/crew_quarters/recreation_area) "rdZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -19192,33 +18986,27 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "rff" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_y = -26 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/curtain/black{ + anchored = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/space) "rfh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/space) "rfn" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass/security{ + name = "Cell Block"; + req_one_access = null + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, +/obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, /area/security/hallway) "rfy" = ( @@ -19270,20 +19058,24 @@ /turf/simulated/floor/wood, /area/space) "rhq" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/door/airlock/engineering{ + name = "Solars"; + req_one_access = null }, -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "rhS" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 29 +/obj/structure/table/reinforced, +/obj/item/forensics/sample_kit, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28 }, -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) +/turf/simulated/floor/tiled/old_cargo/white, +/area/crew_quarters/heads/hos) "rit" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19312,7 +19104,16 @@ /turf/space, /area/quartermaster/miningdock) "riA" = ( -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "riD" = ( /obj/structure/cable/green{ @@ -19336,13 +19137,33 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "riR" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/door/firedoor{ +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/ablative{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/space) "rja" = ( /obj/machinery/light{ dir = 4 @@ -19353,22 +19174,14 @@ /turf/simulated/floor/wood, /area/quartermaster/foyer) "rjc" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/obj/machinery/meter, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, +/turf/simulated/shuttle/wall/voidcraft/no_join, /area/quartermaster/miningdock) "rjp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/effect/floor_decal/techfloor{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/tiled, +/area/space) "rjt" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, @@ -19447,19 +19260,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/port) "rmM" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/victory/surfacebase/bar_backroom) "rnB" = ( /obj/machinery/air_alarm{ @@ -19474,11 +19279,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "rnP" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, -/area/maintenance/dormitory) +/area/victory/surfacebase/bar_backroom) "rot" = ( /obj/structure/table/reinforced, /obj/item/suit_cooling_unit, @@ -19493,18 +19300,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "rpu" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/structure/cable/green, -/obj/structure/window/reinforced/polarized/full{ - id = "Interr"; - name = "interrogation window" - }, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/security/interrogation) +/obj/machinery/camera/network/prison, +/obj/structure/table/reinforced, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, +/turf/simulated/floor/tiled, +/area/security/prison) "rpY" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -19518,9 +19320,19 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "rqa" = ( -/obj/machinery/camera/network/security, -/turf/simulated/floor/tiled, -/area/security/range) +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "rqb" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -19566,15 +19378,9 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "rrG" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/east_mount, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) +/obj/machinery/camera/network/security, +/turf/simulated/floor/tiled, +/area/space) "rrW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -19602,25 +19408,13 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_10) "rtd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/red/border{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/purcarpet, /area/space) "rtl" = ( /obj/effect/floor_decal/techfloor{ @@ -19629,19 +19423,18 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/port) "rtT" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/security{ - name = "Visitation"; - req_one_access = null +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/access_helper/airlock/station/security/department, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/space) "rua" = ( -/obj/structure/grille, -/turf/simulated/floor/airless, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled, /area/space) "rul" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19668,112 +19461,35 @@ /turf/simulated/floor/wood, /area/space) "rwg" = ( -/obj/structure/closet/bombclosetsecurity, -/obj/effect/floor_decal/corner/blue/full{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/space) "rwl" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, /area/space) "rwt" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/medium{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/accessory/armor/armorplate/mediumtreated{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/turf/simulated/floor/tiled/steel, +/area/space) "rwE" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/structure/cable/green, -/obj/machinery/power/apc/east_mount, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/carpet/purcarpet, +/area/space) "rxu" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -19796,20 +19512,11 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "rxU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/Dorm_11) "ryo" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -19823,22 +19530,7 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "ryB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/prison) "ryZ" = ( /obj/machinery/recharge_station, @@ -19863,8 +19555,25 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "rBm" = ( -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass/security{ + name = "Permanent Confinement"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/department, +/turf/simulated/floor/tiled, +/area/victory/surfacebase/bar_backroom) "rBD" = ( /obj/machinery/light{ dir = 1 @@ -19876,7 +19585,7 @@ /area/hallway/primary/port) "rBW" = ( /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19906,13 +19615,11 @@ /turf/simulated/floor/plating, /area/space) "rEN" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass{ - name = "Bar" +/obj/structure/closet/secure_closet/brig, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/crew_quarters/bar) "rFh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19958,13 +19665,8 @@ /turf/space/basic, /area/quartermaster/foyer) "rGC" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 - }, -/turf/simulated/floor/wood, +/obj/structure/dispenser/oxygen, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "rGM" = ( /obj/machinery/door/window/brigdoor/southleft{ @@ -20016,31 +19718,25 @@ /turf/simulated/wall/r_wall/prepainted, /area/maintenance/dormitory) "rJX" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/button/remote/airlock{ + id = "dorm11"; + name = "Room 11 Lock"; + pixel_x = -26; + pixel_y = -4; + specialfunctions = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "rKt" = ( -/obj/structure/table/reinforced, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/microtaser, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/newscaster, +/turf/simulated/wall/r_wall, +/area/victory/surfacebase/bar_backroom) "rKF" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) -"rLT" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/security/security_lockerroom) "rMp" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -20051,17 +19747,26 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/maintenance/bar/lower) "rNI" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/victory/surfacebase/bar_backroom) "rNK" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/security/detectives_office) "rNW" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -20105,18 +19810,9 @@ /turf/simulated/floor/wood, /area/hallway/primary/port) "rOX" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/dark, +/area/space) "rPs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -20152,17 +19848,8 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) -"rQx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) "rQZ" = ( -/obj/machinery/door/firedoor, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/old_cargo/gray, /area/security/lobby) "rRe" = ( /obj/machinery/door/airlock/maintenance/sec{ @@ -20179,10 +19866,9 @@ /turf/simulated/floor/plating, /area/maintenance/security/port) "rRg" = ( -/obj/structure/toilet{ - pixel_y = 10 - }, -/turf/simulated/floor/tiled/white, +/obj/structure/lattice, +/obj/structure/grille, +/turf/space, /area/crew_quarters/sleep/Dorm_1) "rRy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20194,15 +19880,7 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "rRV" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/old_tile/gray, +/turf/space/basic, /area/security/range) "rSn" = ( /obj/machinery/atm{ @@ -20250,14 +19928,16 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "rVo" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/machinery/door/firedoor{ +/obj/machinery/door/firedoor/glass{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint_stripe/darkred, +/turf/simulated/floor/plating, +/area/crew_quarters/bar) "rVt" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -20273,39 +19953,24 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "rVx" = ( -/obj/machinery/recharge_station, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/button/remote/airlock{ - id = "bartoliet1"; - name = "Bar Toilet 1 Lock"; - pixel_y = -10; - specialfunctions = 4; - pixel_x = 24; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "rWk" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/sign/directions/roomnum{ - dir = 9; - pixel_x = -32; - pixel_y = -3 +/obj/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + req_one_access = null }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/recreation_area) "rWH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20385,20 +20050,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "sap" = ( -/obj/machinery/light/small, -/obj/machinery/suit_cycler{ - req_access = null +/obj/structure/table/woodentable, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -37 }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/item/instrument/violin, +/turf/simulated/floor/wood, +/area/space) "sat" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/space) "saA" = ( /turf/simulated/wall/prepainted, /area/maintenance/central) @@ -20443,35 +20105,22 @@ /turf/simulated/floor/wood, /area/space) "sbV" = ( -/obj/structure/table/woodentable, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/light/small{ + dir = 4 }, -/obj/item/instrument/violin, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "sca" = ( -/obj/structure/table/rack/shelf/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/storage/box/flashshells, -/obj/item/storage/box/shotgunammo, -/obj/item/storage/box/shotgunshells{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/storage/box/shotgunshells{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/gun/ballistic/shotgun/pump/combat, -/obj/item/gun/ballistic/shotgun/pump/combat, -/obj/item/gun/ballistic/shotgun/pump/combat, -/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/rack/shelf/steel, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/space) "scW" = ( /turf/simulated/floor/wood, /area/station/stairs_two) @@ -20483,19 +20132,83 @@ /turf/simulated/floor/tiled/monotile, /area/security/hallway) "sfg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/table/rack/shelf/steel, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/mask/balaclava{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/legguards/riot{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/item/clothing/accessory/armor/armguards/riot{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/effect/floor_decal/corner/red/full{ + dir = 1 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/space) "sfl" = ( /obj/machinery/status_display/supply_display{ pixel_y = 32 @@ -20515,20 +20228,9 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "sft" = ( -/obj/structure/closet/toolcloset, -/obj/item/storage/toolbox/mechanical, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/glass, -/obj/item/stack/cable_coil/random, -/obj/fiftyspawner/wood, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/fiftyspawner/steel, -/turf/simulated/floor/wood, +/obj/machinery/light, +/obj/machinery/computer/arcade, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "sfB" = ( /obj/structure/cable/green{ @@ -20537,55 +20239,34 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "sfT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/airlock_sensor{ - id_tag = "solar_sensor"; - pixel_x = 28; - pixel_y = -1 - }, -/obj/machinery/meter{ - frequency = 1443; - id = "dist_aux_meter"; - name = "Distribution Loop" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "solar_dock"; +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) +"shl" = ( +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) -"shl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/undies_wardrobe, +/turf/simulated/floor/wood, +/area/space) +"shK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 4 + icon_state = "2-8" }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) -"shK" = ( -/obj/machinery/flasher/portable, -/obj/effect/floor_decal/corner/blue/full, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "shQ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/computer/arcade, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/radio/intercom{ + pixel_y = -24 }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/machinery/photocopier, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "shT" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -20606,8 +20287,10 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "siq" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "sje" = ( /obj/machinery/vending/hydronutrients, @@ -20629,45 +20312,44 @@ /turf/simulated/floor/tiled, /area/vacant/vacant_shop) "slc" = ( -/obj/structure/table/reinforced, -/obj/machinery/microscope, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + name = "Custodial Closet" }, -/turf/simulated/floor/tiled/old_cargo/white, +/obj/map_helper/access_helper/airlock/station/service/janitor, +/turf/simulated/floor/plating, /area/space) "slX" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ +/obj/item/radio/intercom{ dir = 1; - frequency = 1379; - id_tag = "solar_pump" + name = "Station Intercom (General)"; + pixel_y = 26 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "smu" = ( /obj/structure/table/steel, /obj/item/tape_recorder, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "smw" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/machinery/disposal, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/turf/simulated/floor/airless, +/area/crew_quarters/sleep/Dorm_9) "smZ" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -20697,13 +20379,29 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "snx" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/dark, -/area/space) +/area/security/detectives_office) "snz" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -20723,23 +20421,25 @@ /turf/simulated/floor/tiled, /area/space) "soA" = ( -/obj/spawner/window/reinforced/full/firelocks, -/obj/structure/curtain/open/bed{ - anchored = 1; - name = "curtain" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "spT" = ( -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/effect/floor_decal/corner/red{ + dir = 6 }, -/obj/machinery/power/smes/buildable{ - charge = 15000; - cur_coils = 3 +/obj/effect/floor_decal/corner/red{ + dir = 9 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/airless, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, /area/space) "sqj" = ( /turf/space/basic, @@ -20771,32 +20471,32 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "swb" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/gunbox/lethal, -/obj/item/gunbox/lethal, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled, +/area/prison/cell_block) "swp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "swq" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/obj/machinery/light/small, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/structure/closet/jcloset, +/obj/random/soap, +/obj/item/mop, +/obj/item/storage/bag/trash, +/obj/item/lightreplacer, +/obj/item/reagent_containers/glass/rag/sponge, +/obj/item/reagent_containers/glass/rag/sponge, +/turf/simulated/floor/tiled/dark, +/area/space) "swC" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) @@ -20845,14 +20545,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "syh" = ( -/obj/structure/cable/green, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/security/range) +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "sze" = ( /turf/simulated/wall/prepainted/security, /area/maintenance/security/port) @@ -20865,11 +20565,23 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "szl" = ( -/obj/machinery/door/airlock/glass{ - name = "Eva Storage" +/obj/structure/closet/secure_closet/bar, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/item/storage/box/beanbags/large, +/obj/item/storage/box/beanbags/large, +/obj/item/clothing/accessory/permit/gun/bar, +/obj/item/paper{ + info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; + name = "Shotgun permit" }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/item/clothing/suit/armor/vest, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/turf/simulated/floor/wood, +/area/maintenance/bar/lower) "szv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -20973,25 +20685,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "sDU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ +/obj/structure/bed/chair{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/old_cargo/gray, /area/security/hallway) "sEg" = ( /obj/structure/flora/pottedplant/orientaltree, @@ -21038,9 +20735,17 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/port) "sEK" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/structure/table/steel_reinforced, +/obj/machinery/cell_charger, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "sFl" = ( /obj/machinery/light{ dir = 4 @@ -21048,12 +20753,20 @@ /turf/simulated/floor/tiled, /area/vacant/vacant_shop) "sFq" = ( -/obj/machinery/holopad, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/machinery/button/remote/airlock{ + id = "bartoliet1"; + name = "Bar Toilet 1 Lock"; + pixel_y = -10; + specialfunctions = 4; + pixel_x = 24; + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/space) "sFY" = ( /obj/item/radio/intercom{ dir = 1; @@ -21066,24 +20779,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "sGD" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/techfloor/corner{ dir = 4 }, -/obj/machinery/door/airlock{ - id_tag = "dorm10"; - name = "Dorm 1" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/turf/simulated/floor/tiled, +/area/space) "sGF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -21092,21 +20792,34 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "sGV" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) -"sHt" = ( -/obj/machinery/airlock_sensor{ - dir = 1; - id_tag = "victory_annex_dock"; - pixel_x = -22 +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1380; - id_tag = "victory_annex_dock_pump" +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/space) +"sHt" = ( +/obj/machinery/airlock_sensor{ + dir = 1; + id_tag = "victory_annex_dock"; + pixel_x = -22 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "victory_annex_dock_pump" }, /obj/map_helper/airlock/sensor/chamber_sensor, /obj/map_helper/airlock/atmos/chamber_pump, @@ -21126,18 +20839,13 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/space) "sIN" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monotile, +/area/vacant/vacant_office) "sJf" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -21157,17 +20865,30 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "sJm" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/shuttle/wall/voidcraft/green, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/space) "sJp" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/turf/simulated/floor/tiled, +/area/space) "sJy" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -21181,18 +20902,25 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "sJK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/airlock/glass/security{ - name = "Security EVA"; - req_one_access = null +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/map_helper/access_helper/airlock/station/security/brig, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/sign/department/interrogation{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/dark, /area/space) "sJN" = ( /turf/simulated/floor/tiled/white, @@ -21205,9 +20933,18 @@ /turf/simulated/floor/plating, /area/victory/surfacebase/mining_main/refinery) "sKe" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) +/obj/structure/closet/gmcloset{ + name = "formal wardrobe" + }, +/obj/item/glass_jar, +/obj/item/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, +/obj/item/clothing/accessory/hawaii/random, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/maintenance/bar/lower) "sKM" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -21250,10 +20987,9 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "sMf" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/target_stake, -/turf/simulated/floor/tiled/old_tile/red, -/area/security/range) +/obj/structure/closet/l3closet/janitor, +/turf/simulated/floor/tiled/dark, +/area/space) "sMZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -21281,55 +21017,42 @@ /turf/simulated/floor/wood, /area/space) "sPQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/access_button{ - command = "cycle_int"; - frequency = 1379; - master_tag = "solar_dock"; - name = "interior access button"; - pixel_x = -28; - pixel_y = -24 + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/airless, /area/maintenance/dormitory) "sQF" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/shower{ - dir = 1 +/obj/machinery/holopad, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, -/obj/structure/curtain/open/shower/engineering, -/turf/simulated/floor/tiled, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/tiled/dark, +/area/security/detectives_office) "sQR" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/simulated/floor/wood, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_9) "sRa" = ( /obj/structure/cable/green{ @@ -21343,20 +21066,26 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "sRb" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Security Lobby" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ - dir = 8 + dir = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/security/lobby) +/obj/machinery/status_display{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "sRg" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -21370,10 +21099,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "sRB" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/item/radio/intercom{ + pixel_y = -24 }, -/turf/simulated/floor/carpet/purcarpet, +/obj/structure/bed/double/padded, +/obj/random/bedsheet/double, +/turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "sSh" = ( /obj/machinery/door/airlock/maintenance, @@ -21420,29 +21151,34 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "sUS" = ( -/obj/structure/toilet{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/light/small, -/obj/landmark{ - name = "xeno_spawn"; - pixel_x = -1 +/obj/machinery/door_timer/cell_3{ + id = "Cell 1"; + name = "Cell 1"; + pixel_x = 32 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"sUT" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/obj/structure/closet/jcloset, -/obj/random/soap, -/obj/item/mop, -/obj/item/storage/bag/trash, -/obj/item/lightreplacer, -/obj/item/reagent_containers/glass/rag/sponge, -/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/space) +"sUT" = ( +/turf/simulated/floor/tiled/old_cargo/gray, +/area/prison/cell_block) "sVe" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -21565,45 +21301,36 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_10) "tbT" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_one_access = null +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/obj/map_helper/access_helper/airlock/station/security/department, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/space) +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) "tcb" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/item/stool/padded, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "tdp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/old_cargo/gray, /area/security/hallway) "tdE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21640,9 +21367,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "tet" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/security/range) +/obj/structure/closet/walllocker{ + pixel_y = 32 + }, +/obj/item/pickaxe/silver, +/obj/item/pickaxe/silver, +/obj/item/clothing/head/helmet/space/void/mining, +/obj/item/clothing/suit/space/void/mining, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "tey" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -21653,11 +21388,15 @@ /turf/simulated/floor/tiled/dark, /area/space) "teE" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -25 +/obj/machinery/holopad, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/space) "teR" = ( /obj/structure/curtain/open/shower/engineering, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21686,22 +21425,17 @@ /turf/simulated/floor/wood, /area/space) "tfX" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/access_button{ - command = "cycle_ext"; - frequency = 1379; - master_tag = "solar_dock"; - name = "exterior access button"; - pixel_x = -26; - pixel_y = 26 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/airless, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/space) "tgq" = ( /obj/machinery/computer/security/telescreen{ @@ -21714,9 +21448,20 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "thb" = ( -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/security/security_processing) "thn" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_coffee{ @@ -21726,8 +21471,21 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "thP" = ( -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) +/obj/structure/closet/toolcloset, +/obj/item/storage/toolbox/mechanical, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/glass, +/obj/item/stack/cable_coil/random, +/obj/fiftyspawner/wood, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/fiftyspawner/steel, +/turf/simulated/floor/wood, +/area/maintenance/bar/lower) "tiA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -21841,7 +21599,9 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "tmo" = ( -/turf/simulated/wall/prepainted, +/obj/machinery/power/solar, +/obj/structure/cable/yellow, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_1) "tmT" = ( /obj/structure/table/marble, @@ -21852,24 +21612,19 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "tnh" = ( -/obj/structure/table/woodentable, -/obj/item/reagent_scanner, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/wood, +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/drinkingglass/soda, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "tnU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/structure/closet/crate/bin{ + anchored = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/maintenance/dormitory) "tos" = ( /obj/structure/cable/green{ @@ -21889,15 +21644,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "tqK" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/structure/table/steel, +/obj/machinery/chemical_dispenser/catering/bar_soft, +/obj/machinery/light{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monotile, /area/space) "tqQ" = ( /obj/structure/table/marble, @@ -21913,16 +21665,16 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "trX" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/airlock/voidcraft{ + frequency = 2020; + id_tag = "belt_shuttle_exterior" }, -/obj/item/gun/energy/gun, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/obj/structure/fans/tiny, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "tsi" = ( /obj/machinery/air_alarm{ dir = 4; @@ -21937,8 +21689,11 @@ /turf/simulated/floor/tiled/monotile, /area/security/hallway) "tsP" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/security/range) +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "ttV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21947,15 +21702,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "ttX" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/status_display/supply_display{ + pixel_y = 32 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/obj/structure/closet/l3closet/janitor, +/turf/simulated/floor/tiled/dark, +/area/space) "tuG" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; @@ -22010,11 +21762,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "txm" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/holopad/ship, -/turf/simulated/floor/tiled/steel, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/old_tile/gray, /area/space) "txD" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -22032,20 +21782,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "txR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 4 - }, +/obj/machinery/suit_cycler/headofsecurity, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/security/hallway) "tyc" = ( /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) @@ -22057,15 +21796,15 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/port) "tzE" = ( -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/structure/sink{ + pixel_y = 22 }, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/structure/mirror{ + dir = 4; + pixel_y = 33 }, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "tzO" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -22097,24 +21836,20 @@ /turf/simulated/floor/tiled/dark, /area/space) "tBU" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armorylight"; + name = "Light Armory Acccess" }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, /area/space) "tCS" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_fore_outer"; - locked = 1; - name = "Engineering Fore External Access"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/external_airlock, -/turf/simulated/floor/tiled, +/turf/simulated/shuttle/wall/voidcraft/green, /area/quartermaster/miningdock) "tCW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -22163,12 +21898,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "tFp" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/obj/structure/reagent_dispensers/beerkeg, +/obj/structure/undies_wardrobe, /turf/simulated/floor/wood, -/area/victory/surfacebase/bar_backroom) +/area/space) "tGf" = ( /obj/machinery/door/blast/shutters{ dir = 8; @@ -22213,16 +21945,8 @@ /turf/space/basic, /area/quartermaster/warehouse) "tHt" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/purcarpet, +/obj/structure/railing, +/turf/space, /area/crew_quarters/sleep/Dorm_9) "tHz" = ( /obj/effect/floor_decal/corner/red{ @@ -22292,39 +22016,33 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "tJL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor{ + dir = 9 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, +/area/space) "tJR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/camera/network/outside, +/turf/space, /area/crew_quarters/sleep/Dorm_1) "tKs" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/simulated/floor/wood, +/obj/machinery/access_button{ + command = "cycle_ext"; + frequency = 1379; + master_tag = "solar_dock"; + name = "exterior access button"; + pixel_x = -26; + pixel_y = 26 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/airless, /area/crew_quarters/recreation_area) "tKL" = ( /obj/structure/cryofeed, @@ -22349,12 +22067,67 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "tMv" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/structure/table/rack/shelf/steel, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/legguards/ballistic{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/accessory/armor/armguards/ballistic{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/ballistic{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "tMI" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -22373,28 +22146,17 @@ /turf/simulated/floor/plating, /area/security/lobby) "tOk" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/sleep/Dorm_8) "tOX" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/techfloor{ + dir = 5 }, -/obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hos) +/turf/simulated/floor/tiled, +/area/space) "tPv" = ( /obj/structure/bed/chair/sofa/right, /turf/simulated/floor/carpet/bcarpet, @@ -22462,22 +22224,7 @@ /turf/simulated/floor/tiled/dark, /area/space) "tSp" = ( -/obj/structure/closet/secure_closet/bar, -/obj/item/gun/ballistic/shotgun/doublebarrel, -/obj/item/storage/box/beanbags/large, -/obj/item/storage/box/beanbags/large, -/obj/item/clothing/accessory/permit/gun/bar, -/obj/item/paper{ - info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; - name = "Shotgun permit" - }, -/obj/item/clothing/suit/armor/vest, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, -/obj/item/gun/ballistic/shotgun/doublebarrel, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "tSw" = ( /obj/structure/cable/green{ @@ -22512,14 +22259,11 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "tTL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/bed/chair/comfy/teal{ dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "tUu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -22547,22 +22291,21 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "tWk" = ( -/obj/machinery/camera/network/security{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/dark, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/hallway) "tXi" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/holopad, +/obj/effect/floor_decal/corner/red{ + dir = 6 }, -/obj/machinery/camera/network/engineering{ - dir = 8 +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/area/space) "tYa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -22648,14 +22391,13 @@ /turf/simulated/floor/tiled/dark, /area/space) "ubu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red{ - dir = 8 +/obj/structure/table/reinforced, +/obj/machinery/microscope, +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled/old_cargo/white, +/area/victory/surfacebase/tram) "ucb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22672,15 +22414,30 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"ucL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) "udc" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + name = "Security" + }, +/obj/map_helper/access_helper/airlock/station/security/general, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block) "udA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -22751,15 +22508,14 @@ /turf/simulated/floor/tiled, /area/space) "uga" = ( +/obj/structure/bed/chair{ + dir = 4 + }, /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/security/hallway) "uhh" = ( /obj/structure/bed/chair/sofa/left, /obj/effect/floor_decal/spline/fancy/wood{ @@ -22768,12 +22524,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "uiL" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/security/range) +/area/space) "ujm" = ( /obj/item/coin/silver, /obj/item/coin/silver, @@ -22828,36 +22586,36 @@ /turf/simulated/floor/tiled, /area/hydroponics) "ulu" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/turf/simulated/floor/lino, +/area/security/detectives_office) +"ulX" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/effect/floor_decal/corner/red{ + dir = 9 }, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) -"ulX" = ( -/obj/machinery/status_display/supply_display{ - pixel_y = 32 +/obj/machinery/light{ + dir = 8 }, -/obj/structure/closet/l3closet/janitor, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/space) "umL" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/carpet/purcarpet, +/area/space) "umW" = ( /obj/machinery/power/solar, /obj/structure/cable/yellow{ @@ -22866,11 +22624,11 @@ /turf/simulated/floor/airless, /area/space) "unc" = ( -/obj/machinery/door/airlock{ - name = "Restroom" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/showers) "unv" = ( /obj/structure/bed/padded, /obj/machinery/newscaster{ @@ -22883,21 +22641,31 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "uob" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external{ - req_one_access = null +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/effect/floor_decal/techfloor, +/obj/structure/bed/chair/sofa/black/left, +/turf/simulated/floor/tiled, +/area/space) "uoF" = ( -/obj/structure/bed/double, -/obj/item/bedsheet/hosdouble, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/heads/hos) +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Security Lobby" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/space) "uoN" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -22925,16 +22693,14 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "uqa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-2" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/victory/surfacebase/bar_backroom) "uqm" = ( /obj/machinery/cryopod{ @@ -22949,11 +22715,17 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) "utM" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/blue{ + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/area/space) "utN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23015,29 +22787,10 @@ /turf/simulated/floor/carpet, /area/space) "uxC" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/turf/simulated/floor/lino, +/area/security/detectives_office) "uxL" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/holopad, -/turf/simulated/floor/tiled/dark, +/turf/space/basic, /area/security/tactical) "uyg" = ( /obj/machinery/door/firedoor, @@ -23077,11 +22830,23 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "uBn" = ( -/obj/machinery/camera/network/civilian{ - dir = 8 +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armoryriot"; + name = "Emergency Armory Access" + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/space) "uBD" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -23091,26 +22856,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "uBJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/flasher/portable, +/obj/effect/floor_decal/corner/blue/full, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, -/area/security/hallway) +/area/space) "uCB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -23138,27 +22888,28 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "uDJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/button/remote/blast_door{ - id = "armorylight"; - name = "Light Armory Access"; - pixel_x = -6; - pixel_y = 25; - req_access = list(3) - }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 8 +/obj/machinery/requests_console/preset/janitor{ + pixel_x = -33 }, +/obj/structure/table/marble, +/obj/item/lightreplacer, +/obj/item/lightreplacer, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, +/obj/item/holosign_creator, +/obj/item/holosign_creator, +/obj/item/holosign_creator, +/obj/item/holosign_creator, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/lightreplacer, +/obj/fiftyspawner/glass, /turf/simulated/floor/tiled/dark, -/area/security/armoury) +/area/maintenance/bar/lower) "uDY" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -23170,14 +22921,35 @@ /turf/simulated/floor/tiled/dark, /area/space) "uEa" = ( -/obj/structure/closet/wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) -"uFv" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/airless, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/sleep/Dorm_8) +"uFv" = ( +/obj/machinery/button/remote/airlock{ + id = "dorm8"; + name = "Room 8 Lock"; + pixel_x = 24; + pixel_y = -4; + specialfunctions = 4 + }, +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/simulated/floor/wood, /area/space) "uFJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23186,13 +22958,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "uFS" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/gun/energy/ionrifle, -/turf/simulated/floor/tiled/dark, +/turf/space/basic, /area/security/riot_control) "uGb" = ( /obj/structure/closet/secure_closet/freezer/kitchen, @@ -23229,68 +22995,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "uII" = ( -/obj/structure/table/rack/shelf/steel, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/accessory/armor/armguards/ablative{ - pixel_x = -4; - pixel_y = -5 - }, -/obj/item/clothing/accessory/armor/armguards/ablative{ - pixel_x = -4; - pixel_y = -5 - }, -/obj/item/clothing/accessory/armor/armguards/ablative{ - pixel_x = -4; - pixel_y = -5 - }, -/obj/item/clothing/accessory/armor/armguards/ablative{ - pixel_x = -4; - pixel_y = -5 - }, -/obj/item/clothing/accessory/armor/legguards/ablative{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/legguards/ablative{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/legguards/ablative{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/accessory/armor/legguards/ablative{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/clothing/head/helmet/ablative{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/ablative{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/ablative{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/ablative{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/effect/floor_decal/corner/red/full{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/toilet{ + pixel_y = 10 }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled/white, +/area/space) "uJP" = ( /obj/machinery/air_alarm{ dir = 4; @@ -23322,16 +23031,16 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "uMo" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/button/remote/blast_door{ + id = "armorylight"; + name = "Light Armory Access"; + pixel_x = -6; + pixel_y = -25; + req_access = list(3) }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, /area/space) "uMr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -23343,11 +23052,16 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_10) "uMv" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/closet/crate/bin{ + anchored = 1 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "uMw" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -23447,30 +23161,38 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "uOJ" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 +/obj/structure/shuttle/engine/propulsion{ + dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 9 +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/belter) +"uPo" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/borderfloorblack, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 }, +/obj/machinery/door/airlock/glass/security{ + layer = 2.8; + name = "Security"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) -"uPo" = ( -/obj/landmark/spawnpoint/job/janitor, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/area/space) "uPt" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -23478,11 +23200,9 @@ /turf/simulated/floor/wood, /area/quartermaster/foyer) "uPD" = ( -/obj/structure/table/steel, -/obj/item/storage/box/evidence, -/obj/item/camera, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/obj/machinery/scale, +/turf/simulated/floor/wood, +/area/crew_quarters/showers) "uPE" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, @@ -23495,14 +23215,11 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "uQL" = ( -/obj/machinery/computer/security/telescreen{ - pixel_x = 32 - }, -/obj/machinery/atm{ - pixel_y = 30 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "uRr" = ( /obj/structure/table/steel, /obj/item/storage/toolbox/mechanical, @@ -23576,11 +23293,23 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "uXZ" = ( -/obj/structure/lattice, -/obj/machinery/camera/network/outside{ - dir = 9 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/space, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock{ + id_tag = "dorm9"; + name = "Dorm 9" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/space) "uYk" = ( /turf/space/basic, @@ -23623,15 +23352,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/space) -"vbI" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/spawner/window/low_wall/reinforced/full, -/obj/effect/paint_stripe/darkred, -/turf/simulated/floor/plating, -/area/space) "vbN" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -23658,39 +23378,53 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "vcI" = ( -/obj/structure/table/steel, -/obj/machinery/microwave, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/structure/closet/crate, +/obj/item/target, +/obj/item/target, +/obj/item/target, +/obj/item/target, +/obj/item/target, +/obj/item/target, +/obj/item/target, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/old_tile/gray, +/area/space) "vcK" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -26 }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 4; - frequency = 1380; - id_tag = "victory_space_mining_port"; - pixel_x = -26; - req_one_access = list(13) +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/airless, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/space) "vem" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/structure/extinguisher_cabinet{ + pixel_y = -31 }, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "veG" = ( -/obj/machinery/air_alarm{ - dir = 4; +/obj/machinery/recharger/wallcharger{ pixel_x = -22 }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/item/storage/box/flashbangs{ + pixel_y = 7 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/red/full, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/storage/box/flashbangs, +/turf/simulated/floor/tiled/dark, +/area/space) "veV" = ( /obj/item/stool/padded, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -23715,23 +23449,14 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "vfS" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armoryriot"; - name = "Emergency Armory Access" - }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/red{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/interrogation) "vgg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23798,29 +23523,65 @@ /turf/simulated/floor/wood, /area/space) "viX" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) -"vjl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/item/clothing/accessory/storage/pouches/large{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 }, +/obj/item/clothing/accessory/storage/pouches{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/accessory/storage/pouches/large/navy{ + pixel_y = 3 + }, +/obj/item/clothing/accessory/storage/pouches/large/navy{ + pixel_y = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/space) +"vjl" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, -/area/security/security_lockerroom) +/area/space) "vjB" = ( /turf/simulated/wall/r_wall/prepainted, /area/space) @@ -23885,15 +23646,8 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_2) "vnb" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "vnn" = ( /obj/effect/floor_decal/industrial/warning{ @@ -23929,33 +23683,26 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_2) "vov" = ( -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/curtain/open/bed{ + anchored = 1; + name = "curtain" }, -/turf/simulated/floor/tiled/dark, -/area/security/tactical) +/obj/effect/paint_stripe/palebottlegreen, +/turf/simulated/floor/plating, +/area/victory/surfacebase/bar_backroom) "voG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/vacant/vacant_shop) "voZ" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass/security{ - name = "Confinement Processing"; - req_one_access = null +/obj/machinery/light{ + dir = 1 }, -/obj/map_helper/access_helper/airlock/station/security/department, -/turf/simulated/floor/tiled, -/area/space) +/obj/structure/bed/chair/shuttle, +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "vqq" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/tiled, @@ -23976,34 +23723,20 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "vrX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/shuttle/engine/heater{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, -/area/space) +/turf/simulated/shuttle/wall/voidcraft/green, +/area/victory/surfacebase/mining_main/eva) "vsa" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Bar Backroom" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, -/obj/map_helper/access_helper/airlock/station/service/bar, -/turf/simulated/floor/plating, -/area/victory/surfacebase/bar_backroom) +/turf/simulated/floor/tiled/monotile, +/area/space) "vtg" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -24055,11 +23788,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "vuG" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "mining_fore_pump" - }, -/turf/simulated/floor/tiled, +/obj/machinery/shipsensors, +/turf/simulated/floor/airless, /area/quartermaster/miningdock) "vuJ" = ( /obj/structure/cryofeed{ @@ -24069,13 +23799,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) "vvf" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 4 +/obj/machinery/power/smes/buildable{ + RCon_tag = "Solar Farm - SMES 1" }, -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "vvm" = ( /obj/structure/flora/ausbushes/brflowers, @@ -24100,12 +23830,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "vvt" = ( -/obj/machinery/light, -/obj/machinery/computer/ship/sensors{ - dir = 4 +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/turf/simulated/floor/tiled/steel, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/victory/surfacebase/bar_backroom) "vvP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -24141,16 +23870,23 @@ /turf/simulated/floor/tiled, /area/hydroponics) "vws" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor/plating, -/area/space) -"vwu" = ( -/obj/machinery/smartfridge, -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/kitchen) -"vww" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced, +/obj/item/cell/high{ + maxcharge = 15000 + }, +/obj/item/cell/high{ + maxcharge = 15000 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled, +/area/security/prison) +"vwu" = ( +/obj/machinery/smartfridge, +/turf/simulated/wall/prepainted/civilian, +/area/crew_quarters/kitchen) +"vww" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24188,16 +23924,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/victory/surfacebase/mining_main/refinery) "vzq" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/goggles, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/item/gun/energy/laser/practice, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/target_stake, +/turf/simulated/floor/tiled/old_tile/red, +/area/space) "vAu" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/victory/surfacebase/mining_main/uxstorage) @@ -24271,10 +24001,10 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) "vEb" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate/trashcart, +/obj/item/instrument/bikehorn, +/turf/simulated/floor/tiled, /area/space) "vEk" = ( /obj/machinery/chem_master/condimaster, @@ -24288,27 +24018,37 @@ /turf/simulated/floor/carpet, /area/space) "vEz" = ( -/obj/machinery/button/remote/airlock{ - id = "dorm6"; - name = "Room 6 Lock"; - pixel_x = -26; - pixel_y = -4; - specialfunctions = 4 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/table/woodentable, +/obj/machinery/computer/security/telescreen{ + pixel_y = 32 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "vFB" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/obj/machinery/power/terminal, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/airless, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/door/airlock/glass/security{ + name = "Firing Range"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/department, +/turf/simulated/floor/tiled/old_tile/gray, /area/space) "vFG" = ( /turf/space, @@ -24330,9 +24070,11 @@ /turf/simulated/floor/plating, /area/space) "vHh" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/landmark/spawnpoint/job/bartender, -/turf/simulated/floor/wood, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/monotile, /area/victory/surfacebase/bar_backroom) "vIT" = ( /obj/machinery/air_alarm{ @@ -24356,8 +24098,8 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/security/range) +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "vKc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -24378,8 +24120,8 @@ dir = 4 }, /obj/machinery/door/airlock{ - id_tag = "dorm6"; - name = "Dorm 6" + id_tag = "dorm11"; + name = "Dorm 11" }, /obj/machinery/door/firedoor{ dir = 8 @@ -24411,36 +24153,36 @@ /turf/simulated/floor/lino, /area/space) "vNt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/effect/floor_decal/corner/white/border{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) +/obj/machinery/dnaforensics, +/obj/machinery/camera/network/security{ + dir = 4 + }, +/turf/simulated/floor/tiled/old_cargo/white, +/area/security/detectives_office) "vOk" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/prison/cell_block) "vOA" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, /area/space) "vOD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/structure/toilet{ + pixel_y = 10 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/area/maintenance/dormitory) "vOE" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24540,20 +24282,13 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "vUy" = ( -/obj/structure/table/steel, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/item/storage/box/teargas{ - pixel_y = 3 - }, -/obj/effect/floor_decal/corner/red{ - dir = 10 +/obj/structure/table/woodentable, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -37 }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/obj/item/instrument/trumpet, +/turf/simulated/floor/wood, +/area/space) "vUZ" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -24620,41 +24355,25 @@ /turf/simulated/floor/tiled/dark, /area/space) "vYQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/turf/simulated/floor/wood, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/recreation_area) "vZO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/chair{ + dir = 1 }, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/space) +/area/crew_quarters/bar) "wan" = ( /obj/structure/table/bench/padded, /obj/landmark/spawnpoint/job/shaft_miner, /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/storage) "wbI" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/door/airlock/glass/security{ - name = "Brig"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/dark, -/area/security/prison) +/turf/simulated/floor/tiled/white, +/area/maintenance/bar/lower) "wch" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/hallway/primary/port) @@ -24664,8 +24383,11 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/interrogation) "wcN" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_1) +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/white, +/area/space) "wdy" = ( /obj/item/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ @@ -24685,18 +24407,6 @@ "wdM" = ( /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area_hallway) -"wex" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 6 - }, -/obj/structure/sign/department/armory{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) "weX" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24731,11 +24441,18 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "wgh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/victory/surfacebase/mining_main/eva) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/door/airlock/glass/security{ + name = "Brig"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/security/general, +/turf/simulated/floor/tiled/dark, +/area/space) "wgv" = ( /obj/random/trash_pile, /obj/machinery/light/small, @@ -24802,14 +24519,16 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "wkw" = ( -/obj/machinery/door/airlock/engineering{ - name = "Solars"; - req_one_access = null +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-4" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/airless, /area/maintenance/dormitory) "wlm" = ( /obj/machinery/light{ @@ -24841,7 +24560,10 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "wmr" = ( -/turf/simulated/wall/r_wall/prepainted/security, +/obj/machinery/computer/secure_data{ + dir = 1 + }, +/turf/simulated/floor/tiled/old_cargo/white, /area/victory/surfacebase/tram) "wmE" = ( /obj/machinery/light_switch{ @@ -24852,20 +24574,11 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "wni" = ( -/obj/structure/table/steel, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/item/storage/box/evidence{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/pen/red{ - pixel_x = -7 +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -25 }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/turf/simulated/floor/tiled/dark, +/area/space) "wnq" = ( /obj/machinery/vending/security, /obj/machinery/newscaster/security_unit{ @@ -24879,67 +24592,24 @@ /turf/simulated/floor/tiled, /area/space) "wnE" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/head/helmet/combat{ - pixel_x = 5; - pixel_y = -6 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = 5; - pixel_y = -6 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = 5; - pixel_y = -6 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = -6; - pixel_y = 5 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = 5; - pixel_y = 5 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 }, -/obj/item/clothing/head/helmet/combat{ - pixel_x = 5; - pixel_y = 5 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/showers) "woa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/light/small{ - dir = 4 - }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/area/maintenance/dormitory) "woO" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -24956,46 +24626,40 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/port) "wpx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/yellow{ +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/area/space) "wqn" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/showers) "wqI" = ( -/obj/machinery/access_button{ - command = "cycle_ext"; - frequency = 1379; - master_tag = "mining_fore_airlock"; - name = "exterior access button"; - pixel_y = -23; - req_one_access = list(48) - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "mining_fore_outer"; - locked = 1; - name = "Engineering Fore External Access"; - req_one_access = null +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/map_helper/access_helper/airlock/station/external_airlock, -/turf/simulated/floor/tiled, -/area/quartermaster/miningdock) +/obj/landmark/spawnpoint/job/janitor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/space) "wqQ" = ( /obj/structure/table/woodentable, /obj/structure/flora/pottedplant/fern, @@ -25044,11 +24708,9 @@ /turf/simulated/floor/tiled, /area/space) "wuH" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "wuQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25059,22 +24721,22 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "wuV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/bed/chair/comfy/teal, +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 7 }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/turf/simulated/floor/wood, +/area/space) "wvw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock{ - name = "Custodial Closet" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/map_helper/access_helper/airlock/station/service/janitor, -/turf/simulated/floor/plating, -/area/janitor) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/maintenance/dormitory) "wvM" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -25098,11 +24760,14 @@ /turf/simulated/floor/plating, /area/space) "wxD" = ( -/obj/structure/railing{ - dir = 4 +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 7 }, -/obj/structure/railing, -/turf/space, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/simulated/floor/wood, /area/space) "wxQ" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -25114,17 +24779,29 @@ /turf/simulated/floor/tiled, /area/station/stairs_two) "wya" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "wye" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25139,14 +24816,19 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "wym" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/door/airlock/glass/security{ + name = "Firing Range"; + req_one_access = null }, +/obj/map_helper/access_helper/airlock/station/security/department, /turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/area/space) "wyR" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25158,12 +24840,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "wzk" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light/small{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_1) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/maintenance/bar/lower) "wzI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -25180,25 +24864,18 @@ /area/hallway/primary/port) "wzQ" = ( /obj/structure/table/steel, -/obj/item/folder/red, -/obj/item/folder/red{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/machinery/recharger, -/obj/item/book/manual/security_space_law, -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -32 - }, /turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/area/security/hallway) "wAB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/flora/pottedplant/stoutbush, +/obj/item/radio/intercom{ + pixel_y = -24 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/security/range) +/area/crew_quarters/heads/hos) "wBX" = ( /obj/machinery/vending/security, /obj/machinery/camera/network/security{ @@ -25253,14 +24930,13 @@ /turf/simulated/floor/tiled/techfloor, /area/security/lobby) "wES" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/obj/structure/sign/department/interrogation{ - pixel_y = -32 +/obj/effect/floor_decal/techfloor, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled/old_cargo/gray, -/area/security/security_processing) +/obj/structure/dogbed, +/turf/simulated/floor/tiled, +/area/space) "wEU" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -25276,21 +24952,17 @@ /turf/simulated/floor/tiled, /area/space) "wFN" = ( -/obj/machinery/button/remote/blast_door{ - id = "armoryriot"; - name = "Emergency Armory Access"; - pixel_x = -25; - pixel_y = -6; - req_access = list(3) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "wFO" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -25302,13 +24974,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "wGB" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/industrial/outline/red, -/obj/item/gun/energy/phasegun/rifle, -/obj/item/gun/energy/phasegun/rifle, +/obj/structure/cable/green, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/space) "wGI" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, @@ -25316,28 +24988,26 @@ "wGM" = ( /turf/space/basic, /area/security/prison) -"wHn" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +"wHy" = ( +/obj/structure/table/reinforced, +/obj/item/folder/yellow{ + pixel_y = -5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/item/folder/blue{ + pixel_y = -3 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/folder/red, +/obj/item/storage/box/swabs{ + layer = 5 }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_9) -"wHy" = ( -/obj/structure/table/steel, -/turf/simulated/floor/tiled/techmaint, -/area/security/security_lockerroom) -"wHH" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/spray/luminol, -/obj/item/uv_light, -/obj/machinery/light, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/old_cargo/white, +/area/security/detectives_office) +"wHH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/old_tile/gray, /area/space) "wIB" = ( /obj/effect/floor_decal/techfloor{ @@ -25371,14 +25041,15 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "wKc" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/machinery/camera/network/civilian{ + dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/turf/simulated/floor/tiled/dark, +/area/maintenance/bar/lower) "wKj" = ( /obj/machinery/computer/security{ dir = 8 @@ -25419,12 +25090,14 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "wLw" = ( -/obj/structure/shuttle/engine/heater{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/shuttle/wall/voidcraft/green, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/maintenance/dormitory) "wLD" = ( /obj/machinery/air_alarm{ dir = 4; @@ -25450,14 +25123,17 @@ /turf/simulated/floor/carpet, /area/space) "wNN" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/structure/bed/chair{ + dir = 1 }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "wOi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25474,36 +25150,20 @@ /turf/simulated/floor/tiled, /area/space) "wOo" = ( -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, -/turf/simulated/floor/wood, +/turf/simulated/floor/plating, /area/crew_quarters/sleep/Dorm_11) "wPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/turf/simulated/floor/airless, +/area/maintenance/dormitory) "wQg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, +/obj/machinery/computer/ship/engines, +/turf/simulated/floor/airless, /area/quartermaster/miningdock) "wQh" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -25511,10 +25171,19 @@ /turf/simulated/floor/tiled/steel, /area/space) "wQE" = ( -/obj/structure/table/steel, -/obj/item/reagent_containers/food/drinks/metaglass, -/turf/simulated/floor/tiled/monotile, -/area/security/security_equiptment_storage) +/obj/structure/dogbed, +/obj/machinery/camera/network/civilian, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/mob/living/simple_mob/animal/passive/bird/ringneck_dove{ + desc = "The bartenders newest pet on the station. They seem like they want to help you out."; + name = "Brewster" + }, +/turf/simulated/floor/wood, +/area/space) "wQX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25534,12 +25203,7 @@ /turf/simulated/floor/grass, /area/space) "wRx" = ( -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/lino, +/turf/simulated/floor/tiled/old_cargo/gray, /area/space) "wRQ" = ( /obj/structure/bed/chair/comfy/teal, @@ -25587,13 +25251,12 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/space) "wTG" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/item/stack/cable_coil/yellow, +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/wood, +/obj/structure/table/rack, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "wUb" = ( /obj/machinery/atmospherics/pipe/tank/air{ @@ -25602,21 +25265,25 @@ /turf/simulated/floor/plating, /area/space) "wUd" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -26 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "wUh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/button/remote/airlock{ + id = "dorm1"; + name = "Room 1 Lock"; + pixel_x = -26; + pixel_y = -4; + specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "wUy" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -25652,16 +25319,14 @@ /turf/simulated/floor/tiled, /area/space) "wVH" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled, /area/space) "wWd" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/machinery/camera/network/outside, +/turf/space, /area/crew_quarters/sleep/Dorm_9) "wWe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -25675,18 +25340,13 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) -"wWq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) "wWE" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/computer/shuttle_control/explore/mining{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/tiled/dark, /area/space) "wXo" = ( /obj/machinery/light_switch{ @@ -25778,17 +25438,29 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "xfA" = ( -/obj/structure/cable/green, -/obj/effect/floor_decal/corner/blue{ - dir = 6 +/obj/structure/table/steel, +/obj/item/radio/intercom{ + pixel_y = -24 }, -/obj/machinery/power/apc/east_mount, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/item/storage/box/evidence{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/pen/red{ + pixel_x = -7 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "xfE" = ( -/obj/effect/floor_decal/techfloor{ - dir = 10 +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass/security{ + name = "Visitation"; + req_one_access = null }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/access_helper/airlock/station/security/department, /turf/simulated/floor/tiled, /area/crew_quarters/bar) "xfO" = ( @@ -25842,16 +25514,21 @@ /turf/simulated/floor/tiled/techfloor, /area/hydroponics) "xiX" = ( -/obj/structure/table/reinforced, -/obj/item/mass_spectrometer/adv, -/obj/item/reagent_scanner, -/turf/simulated/floor/tiled/old_cargo/white, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/space) "xjf" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 +/obj/structure/closet/wardrobe, +/obj/machinery/newscaster{ + pixel_y = 32 }, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/wood, /area/space) "xjC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25897,7 +25574,9 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "xlH" = ( -/turf/simulated/wall/prepainted, +/obj/machinery/power/solar, +/obj/structure/cable/yellow, +/turf/simulated/floor/airless, /area/crew_quarters/sleep/Dorm_9) "xlN" = ( /obj/effect/floor_decal/corner/green{ @@ -25906,12 +25585,7 @@ /turf/simulated/floor/tiled/dark, /area/space) "xlY" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/closet/wardrobe, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/wood, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/sleep/Dorm_1) "xmk" = ( /obj/machinery/recharge_station, @@ -25939,9 +25613,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "xnG" = ( -/obj/machinery/scale, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/space) +/area/maintenance/dormitory) "xod" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/techfloor{ @@ -26076,26 +25755,22 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "xxx" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, /area/space) "xxI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/dormitory) +/turf/simulated/floor/airless, +/area/crew_quarters/recreation_area) "xyM" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -26129,42 +25804,70 @@ /turf/simulated/floor/crystal, /area/station/stairs_two) "xDo" = ( -/obj/machinery/door/window/brigdoor/westright{ - dir = 4; - name = "Firing Range Door" +/obj/machinery/papershredder, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 }, -/turf/simulated/floor/tiled/old_tile/gray, -/area/security/range) +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/hos) "xDu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/table/rack/shelf/steel, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/clothing/suit/armor/pcarrier/riot{ + pixel_x = -5; + pixel_y = -2 }, /obj/effect/floor_decal/corner/red{ - dir = 4 + dir = 5 }, -/obj/machinery/button/remote/blast_door{ - id = "armorytactical"; - name = "Tactical Armory Access"; - pixel_x = 25; - pixel_y = -6; - req_access = list(3) +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = 11; + pixel_y = -3 }, /turf/simulated/floor/tiled/dark, -/area/security/riot_control) +/area/space) "xDD" = ( /obj/effect/floor_decal/corner/red, /obj/structure/table/bench/padded, /turf/simulated/floor/tiled, /area/vacant/vacant_shop) "xEP" = ( -/obj/machinery/camera/network/outside{ - dir = 9 - }, -/turf/space, -/area/space) +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/sterile/latex, +/obj/item/reagent_containers/syringe, +/turf/simulated/floor/tiled/old_cargo/white, +/area/crew_quarters/heads/hos) "xFI" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -31 @@ -26187,15 +25890,18 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "xHo" = ( -/obj/structure/flora/pottedplant/stoutbush, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/obj/machinery/light/small, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/Dorm_1) "xHr" = ( /turf/space/basic, /area/security/forensics) @@ -26215,11 +25921,14 @@ /turf/simulated/floor/wood, /area/space) "xHT" = ( -/obj/machinery/camera/network/outside{ - dir = 5 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/airless/ceiling, -/area/space) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/prison/cell_block) "xJc" = ( /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_cargo/gray, @@ -26231,38 +25940,34 @@ /turf/space, /area/space) "xKx" = ( -/obj/machinery/computer/secure_data{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "xKN" = ( /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled, /area/hallway/primary/port) "xKY" = ( -/obj/structure/table/reinforced, -/obj/item/folder/yellow{ - pixel_y = -5 - }, -/obj/item/folder/blue{ - pixel_y = -3 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/item/folder/red, -/obj/item/storage/box/swabs{ - layer = 5 +/obj/machinery/door/airlock/glass/security{ + name = "Security EVA"; + req_one_access = null }, -/obj/item/hand_labeler, -/turf/simulated/floor/tiled/old_cargo/white, -/area/space) +/obj/map_helper/access_helper/airlock/station/security/brig, +/turf/simulated/floor/tiled, +/area/security/prison) "xLM" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/victory/surfacebase/bar_backroom) "xMQ" = ( /obj/structure/cable/green{ @@ -26293,33 +25998,14 @@ /turf/simulated/floor/tiled/dark, /area/space) "xNy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/photocopier, +/turf/simulated/floor/wood, /area/security/hallway) "xNR" = ( -/obj/structure/table/woodentable, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/instrument/trumpet, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/Dorm_8) "xNV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26343,11 +26029,35 @@ /turf/simulated/floor/tiled/dark, /area/space) "xOq" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/obj/machinery/holopad, +/obj/machinery/camera/network/security{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, /area/victory/surfacebase/bar_backroom) "xOx" = ( -/obj/structure/bed/chair/office/light, -/turf/simulated/floor/tiled/old_cargo/white, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/space) "xOE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -26363,37 +26073,29 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "xPR" = ( -/obj/machinery/door/airlock/command{ - id_tag = "HoSdoor"; - name = "Head of Security"; - req_one_access = null - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/map_helper/access_helper/airlock/station/head_office/head_of_security, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/heads/hos) +/area/security/prison) "xQE" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/button/remote/airlock{ + id = "dorm9"; + name = "Room 9 Lock"; + pixel_x = 26; + pixel_y = -4; + specialfunctions = 4 }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/item/gun/energy/taser, -/obj/item/gun/energy/taser, -/obj/item/gun/energy/taser, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/wood, +/area/space) "xSH" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/tiled/monotile, /area/space) "xSK" = ( /obj/structure/cable/green{ @@ -26423,11 +26125,7 @@ /turf/simulated/floor/carpet/blucarpet, /area/space) "xUj" = ( -/obj/structure/closet/wardrobe, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/sleep/Dorm_9) "xUA" = ( /obj/machinery/door/firedoor, @@ -26514,28 +26212,16 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/refinery) "yaJ" = ( -/obj/machinery/requests_console/preset/janitor{ - pixel_x = -33 +/obj/structure/cable/green{ + icon_state = "0-8" }, -/obj/structure/table/marble, -/obj/item/lightreplacer, -/obj/item/lightreplacer, -/obj/item/storage/box/mousetraps, -/obj/item/storage/box/mousetraps, -/obj/item/storage/box/mousetraps, -/obj/item/holosign_creator, -/obj/item/holosign_creator, -/obj/item/holosign_creator, -/obj/item/holosign_creator, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/lightreplacer, -/obj/fiftyspawner/glass, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/obj/machinery/power/smes/buildable{ + charge = 15000; + cur_coils = 3 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/airless, +/area/victory/surfacebase/mining_main/eva) "yaM" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -26584,11 +26270,8 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "ydh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/techfloor, -/turf/simulated/floor/tiled, +/obj/structure/closet/secure_closet/brig, +/turf/simulated/floor/tiled/techmaint, /area/crew_quarters/bar) "ydX" = ( /obj/machinery/air_alarm{ @@ -26599,12 +26282,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "ydZ" = ( -/obj/structure/closet/firecloset, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/steel, +/area/shuttle/belter) "yex" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26649,15 +26331,27 @@ /turf/simulated/floor/tiled, /area/victory/surfacebase/mining_main/uxstorage) "ygn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/space) "ygX" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -27495,27 +27189,27 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +omy +omy +omy +omy +omy +omy +omy +jkE +jkE +kvl +kvl vFG vFG vFG @@ -27689,6 +27383,27 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +kvl vFG vFG vFG @@ -27698,60 +27413,39 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -wjc -wjc -wjc -omy -jkE -kvl -jkE -jkE -vFG -vFG -jkE -jkE -omy -omy -omy -omy -omy -omy -omy -jkE -jkE -kvl -kvl -wjc -wjc -wjc -vFG -vFG -vFG -vFG -vFG -"} -(6,1,1) = {" +"} +(6,1,1) = {" vFG vFG vFG @@ -27903,6 +27597,26 @@ wjc wjc wjc wjc +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -27916,26 +27630,6 @@ wjc wjc wjc wjc -vFG -vFG -fiH -coJ -jkE -jkE -jkE -jkE -coJ -coJ -coJ -smZ -ilS -coJ -coJ -coJ -coJ -coJ -fiH -kvl wjc wjc wjc @@ -28097,6 +27791,26 @@ wjc wjc wjc wjc +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -28110,26 +27824,6 @@ wjc wjc wjc wjc -yhm -kNF -coJ -coJ -coJ -leY -ilS -coJ -coJ -eFO -gag -wvM -aLL -xaB -nYa -dBz -obp -coJ -coJ -vFG wjc wjc wjc @@ -28291,6 +27985,26 @@ wjc wjc wjc wjc +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -28304,26 +28018,6 @@ wjc wjc wjc wjc -xfO -fNA -cca -rUe -fVI -cPf -tdS -exw -coJ -hBA -giN -wRr -iZN -ehz -wxf -cot -nCt -uRS -coJ -vFG wjc wjc wjc @@ -28485,7 +28179,7 @@ wjc wjc wjc wjc -wjc +vFG yiz yiz wjc @@ -28498,120 +28192,6 @@ wjc wjc wjc wjc -bkT -kYD -kYD -jlz -nzi -fdX -fXG -cdS -ngv -jRS -ykB -ddJ -vvm -biT -jZl -dBz -cIn -nCt -coJ -vFG -wjc -wjc -wjc -vFG -vFG -vFG -vFG -vFG -"} -(10,1,1) = {" -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc wjc wjc wjc @@ -28635,93 +28215,13 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -yiz -wGM -wjc -wjc -wjc -wjc -xvK -xvK -xvK -xvK -xvK -xvK -xvK -xvK -xvK -xvK -yiz -yiz -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -hzQ -wME -uxu -nyy -nzi -brs -xfV -rwl -vYG -xlN -fsB -lhA -kBs -cbr -wxf -dBz -dBz -cot -coJ -vFG -wjc -wjc -wjc vFG vFG vFG vFG vFG "} -(11,1,1) = {" +(10,1,1) = {" vFG vFG vFG @@ -28856,6 +28356,14 @@ wjc wjc wjc wjc +wjc +wjc +yiz +wGM +wjc +wjc +wjc +wjc xvK xvK xvK @@ -28865,16 +28373,28 @@ xvK xvK xvK xvK -xvK -xvK -xvK -xvK -xvK -xvK -xvK -xvK -xvK -xvK +oEg +yiz +yiz +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -28886,26 +28406,6 @@ wjc wjc wjc wjc -lSh -fLr -uxq -qot -qot -nMe -mOI -mOI -bqC -bED -jhP -rjI -sje -pSh -sSF -xMX -dBz -psU -coJ -vFG wjc wjc wjc @@ -28915,7 +28415,7 @@ vFG vFG vFG "} -(12,1,1) = {" +(11,1,1) = {" vFG vFG vFG @@ -29067,7 +28567,7 @@ xvK xvK xvK xvK -xvK +oEg xvK wjc wjc @@ -29077,39 +28577,39 @@ wjc wjc wjc wjc -vFG -vFG -vFG -nDp -pWA -pWA -nHw -rbk -vZO -xml -xml -vlr -vlr -vlr -dTF -vlr wjc wjc wjc wjc wjc wjc -vFG wjc -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG vFG vFG "} -(13,1,1) = {" +(12,1,1) = {" vFG vFG vFG @@ -29261,7 +28761,7 @@ xvK xvK xvK xvK -xvK +oEg xvK wjc wjc @@ -29273,27 +28773,27 @@ wjc wjc vFG vFG -vFG -rNI -fAm -fAm -pgA -iAa -shQ -xml -xml -qMQ -vlr -bqO -gRd -brh wjc wjc wjc wjc wjc wjc -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -29303,7 +28803,7 @@ vFG vFG vFG "} -(14,1,1) = {" +(13,1,1) = {" vFG vFG vFG @@ -29455,7 +28955,7 @@ xvK xvK xvK xvK -xvK +pAN xvK wjc wjc @@ -29465,39 +28965,55 @@ wjc wjc wjc wjc +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc -wNN -fAm -fAm -nWy -kRt -dfP -xml -xml -cEV -vlr -gRd -gRd -qIi wjc wjc wjc wjc wjc wjc -iAM wjc wjc wjc +wjc +vFG +vFG vFG vFG vFG vFG vFG "} -(15,1,1) = {" +(14,1,1) = {" +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG vFG vFG vFG @@ -29543,22 +29059,6 @@ vFG vFG vFG vFG -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc vFG vFG vFG @@ -29649,7 +29149,7 @@ xvK xvK xvK xvK -xvK +oEg xvK wjc wjc @@ -29662,26 +29162,26 @@ wjc wjc wjc wjc -wKc -vEb -eVw -gYl -eWV -gVX -oPO -xml -aKP -vlr -nYQ -gRd -llU wjc wjc wjc wjc wjc wjc -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -29691,7 +29191,7 @@ vFG vFG vFG "} -(16,1,1) = {" +(15,1,1) = {" vFG vFG vFG @@ -29764,68 +29264,73 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG wjc wjc wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +xvK +xvK +xvK +xvK +xvK xvK xvK xvK @@ -29838,6 +29343,7 @@ xvK xvK xvK xvK +oEg xvK wjc wjc @@ -29849,33 +29355,27 @@ wjc wjc wjc wjc -vFG -vFG -vFG -vFG wjc wjc wjc -ntA -dsd -fMn -lvf -bUa -mDS -xml -lwy -xml -rjt -gRd -gRd -vws wjc wjc wjc wjc wjc wjc -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -29885,7 +29385,7 @@ vFG vFG vFG "} -(17,1,1) = {" +(16,1,1) = {" vFG vFG vFG @@ -29968,55 +29468,55 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc wjc wjc wjc @@ -30037,7 +29537,7 @@ wjc wjc wjc wjc -wjc +vFG wjc wjc wjc @@ -30050,26 +29550,26 @@ vFG wjc wjc wjc -tBU -tBU -coJ -coJ -nFF -jdy -coJ -coJ -coJ -coJ -coJ -coJ -coJ wjc wjc wjc wjc wjc wjc -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -30079,7 +29579,7 @@ vFG vFG vFG "} -(18,1,1) = {" +(17,1,1) = {" vFG vFG vFG @@ -30162,53 +29662,53 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -wjc -wjc wjc wjc wjc @@ -30237,10 +29737,10 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc +vFG +vFG +vFG +vFG wjc wjc wjc @@ -30273,7 +29773,7 @@ vFG vFG vFG "} -(19,1,1) = {" +(18,1,1) = {" vFG vFG vFG @@ -30356,47 +29856,47 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -kAl -jkE -kAl -jkE -omy -kAl -omy -omy -kAl -omy -kAl -omy -kAl -jkE -omy -kAl -omy -jkE -kAl -jkE -omy -jkE -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -30467,7 +29967,7 @@ vFG vFG vFG "} -(20,1,1) = {" +(19,1,1) = {" vFG vFG vFG @@ -30550,32 +30050,40 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -omy -vFG -jkE -vFG -vFG -jkE -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +omy jkE -vFG -vFG -vFG +kvl jkE -vFG -vFG jkE vFG vFG -vFG jkE -vFG jkE +wjc +wjc +wjc +wjc vFG vFG vFG @@ -30587,14 +30095,6 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -wjc -wjc wjc wjc wjc @@ -30661,7 +30161,7 @@ vFG vFG vFG "} -(21,1,1) = {" +(20,1,1) = {" vFG vFG vFG @@ -30721,20 +30221,8 @@ wjc wjc wjc wjc -iIG wjc -vFG -vFG -vFG -vFG -vFG -vFG -vFG -iIG -iIG -iIG -iIG -vFG +wjc vFG vFG vFG @@ -30748,33 +30236,49 @@ vFG vFG vFG vFG -omy vFG -jkE vFG vFG -jkE vFG vFG -jkE vFG vFG vFG -jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG +fiH +coJ jkE jkE jkE jkE -jkE -vFG -omy -vFG -vFG -vFG -vFG -vFG +coJ +coJ +coJ +smZ +ilS +coJ vFG vFG vFG @@ -30783,10 +30287,6 @@ vFG vFG vFG vFG -coJ -coJ -coJ -eOi wjc wjc wjc @@ -30803,12 +30303,38 @@ xvK xvK xvK xvK -xvK -xvK -xvK -xvK -xvK -xvK +oEg +oEg +oEg +oEg +oEg +oEg +vFG +vFG +vFG +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -30823,16 +30349,13 @@ wjc wjc wjc wjc -jkE -vFG -vFG -vFG -vFG vFG vFG vFG vFG vFG +"} +(21,1,1) = {" vFG vFG vFG @@ -30854,8 +30377,6 @@ vFG vFG vFG vFG -"} -(22,1,1) = {" vFG vFG vFG @@ -30880,11 +30401,33 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +iIG +wjc vFG vFG vFG vFG vFG +iIG +iIG +iIG +iIG +wjc +wjc vFG vFG vFG @@ -30895,11 +30438,86 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +yhm +kNF +coJ +coJ +coJ +leY +ilS +coJ +coJ +eFO +gag +wvM +aLL +xaB +coJ +coJ +coJ +coJ +coJ +coJ +coJ +eOi +coJ +coJ +wjc +wjc +wjc +wjc +wjc +wjc +wjc +xvK +xvK +xvK +xvK +xvK +xvK +xvK +oEg +oEg +oEg +oEg +oEg +oEg vFG vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +jkE vFG wjc wjc @@ -30917,6 +30535,11 @@ wjc wjc wjc wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -30924,11 +30547,9 @@ vFG vFG vFG vFG -iIG -iIG -iIG -iIG vFG +"} +(22,1,1) = {" vFG vFG vFG @@ -30940,30 +30561,19 @@ vFG vFG vFG vFG -jkE -jkE -omy vFG -jkE vFG vFG -uXZ vFG vFG -jkE vFG vFG -xEP -jkE vFG vFG -jkE vFG vFG vFG -jkE vFG -omy vFG vFG vFG @@ -30977,10 +30587,15 @@ vFG vFG vFG vFG -coJ -coJ -coJ -coJ +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +wjc wjc wjc wjc @@ -30996,7 +30611,27 @@ wjc wjc wjc wjc +vFG +vFG +vFG +vFG +vFG +iIG +iIG +iIG +iIG +wjc wjc +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG wjc wjc wjc @@ -31017,17 +30652,45 @@ wjc wjc wjc wjc -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG vFG +xfO +fNA +cca +rUe +fVI +cPf +tdS +exw +coJ +hBA +giN +wRr +iZN +ehz +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -31039,7 +30702,38 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +omy vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -31116,12 +30810,12 @@ vFG vFG vFG vFG -vFG -vFG iIG iIG iIG iIG +wjc +wjc vFG vFG vFG @@ -31152,27 +30846,27 @@ paa paa paa chV -vFG -vFG -vFG -jkE -vFG -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -coJ coJ +bkT +kYD +kYD +jlz +nzi +fdX +fXG +cdS +ngv +jRS +ykB +ddJ +vvm +biT coJ +wjc coJ +fTz +man +wjc coJ coJ wjc @@ -31191,6 +30885,29 @@ wjc wjc wjc wjc +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +omy +vFG +wjc wjc wjc wjc @@ -31211,29 +30928,6 @@ wjc wjc wjc wjc -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG vFG vFG vFG @@ -31311,11 +31005,11 @@ vFG vFG vFG vFG -vFG -vFG iIG iIG iIG +wjc +wjc vFG vFG vFG @@ -31345,27 +31039,28 @@ nSx ykU mSt eCS -chV -vFG -vFG -vFG -jkE -vFG -jkE -jkE -jkE -jkE -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +paa +coJ +hzQ +wME +uxu +nyy +nzi +brs +xfV +rwl +vYG +xlN +fsB +lhA +kBs +cbr coJ +wjc coJ +bCK coJ +wjc coJ coJ wjc @@ -31384,6 +31079,28 @@ wjc wjc wjc wjc +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +omy +vFG wjc wjc wjc @@ -31405,29 +31122,6 @@ wjc wjc wjc wjc -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG vFG vFG vFG @@ -31505,11 +31199,11 @@ vFG vFG vFG vFG -vFG -vFG iIG iIG iIG +wjc +wjc vFG vFG vFG @@ -31539,27 +31233,28 @@ gsO hTh eCr iTQ -chV -vFG -vFG -vFG -jkE -vFG -jkE -vFG -vFG -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -coJ +paa coJ +lSh +fLr +uxq +qot +qot +nMe +mOI +mOI +bqC +bED +jhP +rjI +sje +pSh coJ +wjc +wjc +wjc +wjc +wjc coJ coJ wjc @@ -31598,30 +31293,29 @@ wjc wjc wjc wjc -wjc omy vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -31700,23 +31394,23 @@ vFG vFG vFG vFG -vFG -vFG iIG iIG +wjc +wjc vFG vFG vFG vFG -vFG -wjc wjc wjc wjc -wjc -uYk -uYk -uYk +pbJ +rff +rff +rNs +rNs +rNs rNs chV chV @@ -31733,25 +31427,19 @@ rpY xjJ iqZ cVH -xOq -joe +vov +eAa joe +fnw +fnw +bIg xOq -xOq -xOq -xOq -iUt iUt -dnz -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -coJ +otr +otr +vlr +vlr +vlr coJ coJ coJ @@ -31761,6 +31449,12 @@ wjc wjc wjc wjc +coJ +coJ +wjc +wjc +wjc +wjc wjc wjc wjc @@ -31795,9 +31489,9 @@ wjc wjc omy vFG -vFG -vFG -vFG +wjc +wjc +wjc wjc wjc wjc @@ -31902,15 +31596,15 @@ vFG vFG vFG vFG -vFG -wjc wjc wjc wjc -wjc -uYk -uYk -uYk +wKL +aoS +aoS +bOp +szl +thP fgu jbv bQy @@ -31927,31 +31621,31 @@ vgo vgo vgo vgo -vsa -gST -gST -tFp +osR +eAa +vvt +tSp tSp sft -osR +rKt qTR -xfE -dnz +otr +otr +qMQ +vlr +coJ wjc wjc wjc wjc wjc wjc -vFG -vFG -coJ -coJ -coJ -coJ wjc wjc wjc +coJ +coJ +wjc wjc wjc wjc @@ -31995,7 +31689,6 @@ vFG wjc wjc wjc -coJ wjc wjc wjc @@ -32015,9 +31708,10 @@ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc "} (28,1,1) = {" vFG @@ -32096,15 +31790,15 @@ vFG vFG vFG vFG -vFG -wjc -wjc wjc wjc wjc -uYk -uYk -uYk +wKL +pcp +aoS +mcG +mcG +wzk fgu xhI vny @@ -32122,25 +31816,27 @@ vgo vgo qJn osR -fEj -gST -gST +eAa gST +tSp +tSp xLM -osR -iTp -dnX -dnz +ery +xKx +otr +otr +cEV +vlr +coJ +wjc +wjc +wjc wjc wjc wjc wjc wjc wjc -vFG -vFG -coJ -coJ coJ coJ wjc @@ -32179,8 +31875,6 @@ wjc wjc wjc wjc -wjc -wjc omy vFG vFG @@ -32189,7 +31883,6 @@ vFG wjc wjc wjc -coJ wjc wjc wjc @@ -32209,9 +31902,10 @@ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc "} (29,1,1) = {" vFG @@ -32290,15 +31984,15 @@ vFG vFG vFG vFG -vFG -wjc -wjc wjc wjc wjc -uYk -uYk -uYk +wKL +aoS +aoS +mcG +ifA +hQC fgu nvl yke @@ -32316,29 +32010,29 @@ ojq qQk wCm osR -gST -gST -gST +eAa +eKv +qmt vHh rmM -osR -iTp +rNI +men itV -dnz +otr +aKP +vlr +coJ +wjc +wjc +wjc wjc wjc wjc wjc wjc wjc -vFG -vFG -coJ coJ coJ -vFG -vFG -wjc wjc wjc wjc @@ -32383,7 +32077,6 @@ vFG wjc wjc wjc -coJ wjc wjc wjc @@ -32403,9 +32096,10 @@ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc "} (30,1,1) = {" vFG @@ -32426,23 +32120,23 @@ vFG vFG vFG vFG -vFG -jkE -jkE -vFG -vFG -vFG -vFG -vFG -jkE -vFG -omy -vFG -lKl -cKF -cKF -cKF -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -32484,15 +32178,15 @@ vFG vFG vFG vFG -vFG -wjc wjc wjc wjc -wjc -uYk -uYk -uYk +wKL +wQE +mof +sKe +onm +jNJ fgu sFY yke @@ -32515,23 +32209,29 @@ tnh aYH okB uqa -osR +lbN iTp -pJy -dnz +otr +noF +xml +rjt +coJ wjc wjc +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ wjc wjc wjc wjc wjc -vFG -vFG -vFG -vFG -vFG -vFG wjc wjc wjc @@ -32563,43 +32263,37 @@ wjc wjc wjc wjc +omy +vFG +vFG +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc wjc wjc wjc -omy -vFG -vFG -vFG -vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc -vlr -aWP -vlr -gLH -vlr -vlr -vlr -tbT -vlr wjc wjc wjc wjc wjc -vFG -vFG -vFG "} (31,1,1) = {" vFG @@ -32620,23 +32314,23 @@ vFG vFG vFG vFG -jkE -jkE -vFG -vFG -vFG -vFG -vFG -vFG -omy -kAl -kAl -omy -lKl -wWE -bIg -vvt -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -32678,16 +32372,16 @@ vFG vFG vFG vFG -vFG -jSe -jSe -jSe -jSe -jSe -jSe +wjc jSe jSe -rNs +gLM +gLM +gLM +gLM +gLM +gVX +fgu xbR xnh mQm @@ -32704,24 +32398,66 @@ tPV jBi vir osR -osR -osR -osR -osR -nfV -osR +eAa +rnP +rnP +eAa +eAa +rBm rVo -dah -dnz +qHu +qHu +coJ +coJ +coJ wjc wjc +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ wjc wjc wjc wjc wjc -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +xHr +xHr +xHr +xHr +xHr +inU +inU +inU +inU +wjc +wjc +wjc +wjc +wjc +wjc +jkE vFG vFG vFG @@ -32748,52 +32484,10 @@ wjc wjc wjc wjc -xHr -xHr -xHr -xHr -xHr -inU -inU -inU -inU -wjc -wjc -wjc -wjc -wjc -wjc -jkE -vFG -vFG -vFG -vFG -wjc -wjc -wjc -coJ -wjc wjc wjc wjc wjc -vlr -nti -oHn -slc -hLZ -vlr -iSJ -wTt -jwJ -coJ -wjc -wjc -wjc -wjc -vFG -vFG -vFG "} (32,1,1) = {" vFG @@ -32814,23 +32508,23 @@ vFG vFG vFG vFG -jkE -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -rua -ijr -rua -lKl -kna -dPS -lPz -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -32899,29 +32593,29 @@ tmh deg gLM qHu -bUJ mft -gLM -lwl +mft +mft +mft mpF amn -adl +qHu dnz +man wjc wjc -wjc -wjc -wjc -wjc -wjc -vFG -vFG -vFG -vFG -vFG -vFG -wjc -wjc +pjd +pTI +coJ +nzi +vzq +nzi +nzi +vzq +nzi +coJ +coJ +coJ wjc wjc wjc @@ -32965,29 +32659,29 @@ vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc -vlr -fDp -ksu -xOx -btb -vlr -iSJ -nVN -fju +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +coJ +coJ +coJ +coJ coJ wjc wjc wjc wjc -vFG -vFG -vFG "} (33,1,1) = {" vFG @@ -33008,23 +32702,23 @@ vFG vFG vFG vFG -jkE -vFG -vFG -lKl -cKF -cKF -cKF -lKl -vFG -kAl -kFc -kAl -lKl -ljQ -yhP -kAr -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -33066,7 +32760,7 @@ vFG vFG wjc wjc -vFG +wjc jSe jSe jSe @@ -33091,31 +32785,31 @@ fcn fcn uNd blC -pmq -lAA -fzp +gLM +jSe +ydh ydh rEN dxg -otr -otr -mDr -soA -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -vFG -vFG -vFG -vFG -vFG +lvf +wNN +qHu +qaD +coJ wjc wjc +pjd +pTI +coJ +xml +sZT +xml +xml +qCU +xml +coJ +coJ +coJ wjc wjc wjc @@ -33159,29 +32853,29 @@ vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc -kGo -coV -xKY -xKx -wHH -vlr -vtg -sIb -gPW -coJ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +eKI +lXR +bPf +opE +dxS +wjc +wjc +wjc +wjc "} (34,1,1) = {" vFG @@ -33202,23 +32896,23 @@ vFG vFG vFG vFG -jkE -vFG -vFG -lKl -owe -nji -sjT -lKl -vFG -fZL -uFv -vcK -pRw -oSG -txm -bpN -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -33259,16 +32953,16 @@ wjc vFG vFG vFG -vFG -vFG -jSe -jSe -jSe -jSe +wjc +wjc jSe -uYk -uYk -uYk +eUw +xXX +gLM +gLM +fgu +fgu +fgu gLM mLk jsg @@ -33286,30 +32980,30 @@ vgo vgo sEg gLM -qWi +jSe jqp oPw -gLM -iTp +oPw +xfE hHw -otr +vZO ayj soA +pWM wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +pjd +pTI +coJ +xml +sJp +xml +xml +iAa +xml +coJ +coJ +coJ wjc wjc wjc @@ -33353,29 +33047,29 @@ vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc -vbI -mLp -ksu -xOx -pDg -vlr -iSJ -hvt -iSJ -coJ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +kIl +dDm +ohJ +ioi +cAi +wjc +wjc +wjc +wjc "} (35,1,1) = {" vFG @@ -33396,23 +33090,23 @@ vFG vFG vFG vFG -omy -vFG -vFG -lKl -kna -dPS -lPz -lKl -vFG -kFc -mKC -kFc -lKl -kDi -fEK -pnI -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -33452,17 +33146,17 @@ wjc wjc vFG vFG -vFG -vFG -vFG -wjc wjc wjc wjc wjc -uYk -uYk -uYk +wKL +wKL +wKL +rck +qqz +qqz +fgu gLM kKR vWN @@ -33477,33 +33171,33 @@ vUa nmB vgo qxE +bIK rfy -gLM -tft -tft tft -tft -gLM -xXX -jqp +bfv +mGz +mGz +ydh +mft +slX ygX ohZ -dnz -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +kRt +iLP wjc wjc +pjd +pTI +coJ +xml +wVH +hUD +xml +mDS +xml +coJ +coJ +coJ wjc wjc wjc @@ -33547,29 +33241,29 @@ vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc -vlr -tZC -fKm -cdz -xiX -vlr -sCc -hvt -fju +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +coJ +coJ +xjI +coJ coJ wjc wjc wjc wjc -vFG -vFG -vFG "} (36,1,1) = {" vFG @@ -33590,23 +33284,23 @@ vFG vFG vFG vFG -omy -vFG -vFG -lKl -oqY -yhP -yhP -lKl -kFc -kFc -mKC -vFG -lKl -rFC -utN -pHw -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -33646,17 +33340,17 @@ wjc wjc vFG vFG -vFG -vFG -vFG -wjc wjc wjc wjc wjc -uYk -uYk -uYk +wKL +eJf +fQi +iHN +izW +hBs +ljQ gLM mYh wdy @@ -33671,33 +33365,33 @@ rul nmB vgo jso +jKZ jIs -gLM -fnw +tft +bfv gxS gxS -tft -gLM -gLM -gLM -iTp -ohZ -dnz -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +qHu +mft +qHu +qHu +qHu +lQH +pTI wjc wjc +pjd +pTI +coJ +nnD +kwx +xml +xml +kwx +jfT +coJ +coJ +coJ wjc wjc wjc @@ -33741,29 +33435,29 @@ vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc -iRT -aMT -ezu -vem -ksu -xUA -eMM -tEz -iSJ -coJ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc "} (37,1,1) = {" vFG @@ -33784,23 +33478,23 @@ vFG vFG vFG vFG -jkE -vFG -vFG -lKl -wQh -yhP -yhP -oRa -kFc -kFc -mKC -vFG -lKl -oIU -utN -pHw -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -33840,19 +33534,19 @@ wjc wjc vFG vFG -vFG -vFG -vFG -wjc wjc wjc wjc wjc -uYk -uYk -uYk -gLM -uQL +wKL +wKL +wKL +wcN +vJD +wbI +wbI +cax +vgo dzl vgo eBA @@ -33866,32 +33560,32 @@ lco fcn fQF fcn -pbp -eic -ygn -dvB -rNK -unc -sUS +gLM tft -xXX -oEg -dnz -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +tft +tft +tft +tft +tft +tft +gLM +gLM +gLM +wKL +wKL wjc +pjd +pTI +coJ +rrG +xml +xml +xml +xml +xml +coJ +coJ +coJ wjc wjc wjc @@ -33935,29 +33629,29 @@ vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc -coJ -coJ -yfP -pFn -eKv -coJ -coJ -pbu -coJ -coJ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc "} (38,1,1) = {" vFG @@ -33978,23 +33672,23 @@ vFG vFG vFG vFG -jkE -jkE -vFG -lKl -lfz -yhP -kDi -lKl -kFc -kFc -mKC -vFG -lKl -lKl -aFu -sJm -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -34038,13 +33732,13 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -uYk -uYk -uYk +wKL +sFq +pXB +lwl +syh +gIa +wbI rKF rKF lFu @@ -34061,31 +33755,31 @@ bzQ gLM gLM gLM -dzk -vOk -iHN -iHN -tft -tft -tft -gLM -oUt -dnz -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +bfv +bfv +bfv +bfv +bfv +bfv +bfv +jSe +drw +jSe wjc +coJ wjc +pjd +pTI +coJ +rrG +xml +xml +xml +xml +xml +coJ +coJ +coJ wjc wjc wjc @@ -34129,29 +33823,29 @@ vFG wjc wjc wjc -coJ wjc wjc wjc wjc wjc wjc -coJ -phH -kcV -hSj -coJ -pgF -tYA -pgF -coJ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc "} (39,1,1) = {" vFG @@ -34172,23 +33866,23 @@ vFG vFG vFG vFG -kAl -vFG -vFG -lKl -rFC -yhP -icW -lKl -vFG -kFc -mKC -vFG -lKl -gms -vFB -spT -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -34232,13 +33926,13 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -uYk -uYk -uYk +wKL +wKL +wKL +wKL +fgu +fgu +fgu rKF kdx rCS @@ -34253,33 +33947,33 @@ lGC fLt ggC pSE -rVx -aaJ -moT -pcp -hQC -iHN -unc bfv -tft -wjc -wjc -wjc +bfv +bfv +bfv +bfv +bfv +bfv +bfv +bfv wjc wjc wjc wjc +coJ +coJ +pjd mWM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +cdP +fhg +cdP +cdP +fmE +nJr +coJ +coJ +coJ wjc wjc wjc @@ -34323,7 +34017,6 @@ vFG wjc wjc wjc -coJ wjc wjc wjc @@ -34334,18 +34027,19 @@ wjc wjc wjc wjc -coJ -pgF -tjr -pgF -coJ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc "} (40,1,1) = {" vFG @@ -34366,23 +34060,23 @@ vFG vFG vFG vFG -jkE -vFG -vFG -lKl -mMB -yhP -icW -lKl -vFG -kFc -mKC -vFG -lKl -ffu -ezY -ptH -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -34447,33 +34141,33 @@ qja fLt oza tft -tft -tft -tft -tft -tft -tft -tft -tft -tft -wjc -wjc +bfv +bfv +bfv +bfv +bfv +bfv +bfv +bfv +bfv wjc wjc wjc wjc wjc +coJ +pjd mWM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +vcI +wHH +mSY +jCb +sfT +fjr +coJ +coJ +coJ wjc wjc wjc @@ -34528,18 +34222,18 @@ wjc wjc wjc wjc -coJ -dVe -pJK -pgF -coJ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc "} (41,1,1) = {" vFG @@ -34560,23 +34254,23 @@ vFG vFG vFG vFG -jkE -vFG -vFG -lKl -lKl -lKl -lKl -lKl -vFG -kFc -mKC -vFG -aMt -ckf -wLw -eJf -lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -34655,19 +34349,19 @@ wjc wjc wjc wjc -wjc -wjc +coJ +pjd mWM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +uMv +nlt +pgN +sEK +shK +txm +coJ +coJ +coJ wjc wjc wjc @@ -34722,18 +34416,18 @@ wjc wjc wjc wjc +wjc +wjc coJ +cDK +bFt +jPY coJ coJ coJ coJ +fiH wjc -wjc -wjc -wjc -vFG -vFG -vFG "} (42,1,1) = {" vFG @@ -34754,23 +34448,23 @@ vFG vFG vFG vFG -jkE -kAl -vFG -vFG -cHF -kYq -cHF -vFG -vFG -kFc -mKC -vFG -vFG -nYY -nYY -nYY -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -34849,18 +34543,18 @@ wjc wjc wjc wjc -wjc -wjc +coJ +pjd mWM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +lJl +wym +coJ +coJ +vFB +aBI +coJ +coJ wjc wjc wjc @@ -34918,16 +34612,16 @@ wjc wjc wjc wjc +coJ +qUa +ogo +vsa +nYa +dBz +obp +coJ +coJ wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -vFG -vFG "} (43,1,1) = {" vFG @@ -34948,23 +34642,23 @@ vFG vFG vFG vFG -jkE -omy -vFG -vFG -vFG -vFG -vFG -vFG -kFc -kFc -mKC -kFc -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc wjc vFG vFG @@ -35043,20 +34737,20 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM wjc wjc wjc wjc +coJ +coJ +coJ +coJ wjc wjc -wjc -wjc -wjc -wjc -wjc +vFG wjc wjc wjc @@ -35112,16 +34806,16 @@ wjc wjc wjc wjc +coJ +aHL +ntA +xSH +wxf +cot +nCt +uRS +coJ wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -vFG -vFG "} (44,1,1) = {" vFG @@ -35237,20 +34931,20 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM wjc wjc wjc wjc +coJ +coJ wjc -wjc -wjc -wjc -wjc -wjc -wjc +vFG +vFG +vFG +vFG wjc wjc wjc @@ -35306,16 +35000,16 @@ wjc wjc wjc wjc +coJ +pDg +tqK +jsr +jZl +dBz +cIn +nCt +coJ wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -vFG -vFG "} (45,1,1) = {" vFG @@ -35431,29 +35125,29 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +coJ +coJ +coJ +coJ +coJ +coJ wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +vFG +vFG +vFG +vFG +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ +coJ wjc wjc wjc @@ -35504,12 +35198,12 @@ wjc wjc wjc wjc +wxf +dBz +dBz +cot +coJ wjc -wjc -wjc -vFG -vFG -vFG "} (46,1,1) = {" vFG @@ -35557,98 +35251,98 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -uYk -uYk -uYk -rKF -kAU -jui -tmT -eIx -eLn -eSu -eLn -jGm -sKM -qja -xcL -ggC -aCx -hcP -qit -dyR -fEg -aqa -bRJ -dyR -bRJ -dyR -wtS -wKL -wjc -wjc -wjc -wjc -wjc -mWM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +lKl +cKF +cKF +cKF +lKl +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +uYk +uYk +uYk +rKF +kAU +jui +tmT +eIx +eLn +eSu +eLn +jGm +sKM +qja +xcL +ggC +aCx +hcP +qit +dyR +fEg +aqa +bRJ +dyR +bRJ +dyR +wtS +wKL +wjc +wjc +wjc +coJ +pjd +mWM +coJ +kbF +bdR +qSI +uxk +coJ +wjc +wjc +wjc +wjc +wjc +coJ +coJ +coJ +coJ +hSj +coJ +coJ +coJ +coJ +coJ wjc wjc wjc @@ -35693,17 +35387,17 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +sSF +xMX +dBz +psU +coJ +wjc "} (47,1,1) = {" vFG @@ -35770,11 +35464,11 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc +lKl +owe +nji +sjT +lKl wjc wjc wjc @@ -35819,30 +35513,30 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +coJ +tIe +xml +xml +kct +coJ wjc wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +coJ +coJ +fhP +aWJ +lJV +coJ +coJ +coJ +coJ wjc wjc wjc @@ -35895,9 +35589,9 @@ wjc wjc wjc wjc -vFG -vFG -vFG +wjc +wjc +wjc "} (48,1,1) = {" vFG @@ -35964,11 +35658,11 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc +lKl +kna +dPS +lPz +lKl wjc wjc wjc @@ -36013,30 +35707,30 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +coJ +rot +xml +ovx +jXT +coJ wjc wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +coJ +coJ +bCg +iam +lOP +bpV +coJ +coJ +coJ wjc wjc wjc @@ -36155,14 +35849,14 @@ wjc wjc wjc wjc +fCu wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc +lKl +oqY +yhP +yhP +lKl wjc wjc wjc @@ -36207,30 +35901,30 @@ kxc wjc wjc wjc -wjc -wjc +coJ +pjd mWM +coJ +gSK +xml +eBI +uke +coJ wjc wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +coJ +coJ +coJ +axq +coJ +coJ +coJ +coJ +coJ wjc wjc wjc @@ -36349,14 +36043,14 @@ wjc wjc wjc wjc +fCu wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc +lKl +wQh +yhP +yhP +lKl wjc wjc wjc @@ -36401,30 +36095,30 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +coJ +coJ +iVr +sZT +xSR +coJ wjc wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +muz +qQj +cyv +spT +dFd +ulX +veG +coJ +coJ wjc wjc wjc @@ -36538,19 +36232,19 @@ wjc wjc wjc wjc +vFG +jkE +jkE +vFG +vFG +fCu +vFG wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +oRa +lfz +yhP +kDi +lKl wjc wjc wjc @@ -36595,30 +36289,30 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +pYo +coJ +xml +jiH +riv +coJ wjc wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +coJ +tMv +rOX +aEf +spT +iWR +feT +fMn +coJ +coJ wjc wjc wjc @@ -36653,12 +36347,12 @@ vFG wjc wjc wjc -coJ -coJ -coJ -coJ -coJ -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc iiJ @@ -36732,19 +36426,19 @@ wjc wjc wjc wjc +jkE +jkE +vFG +vFG +vFG +fCu +fCu wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +lKl +rFC +yhP +icW +lKl wjc wjc wjc @@ -36789,30 +36483,30 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +jhV +xKY +gCm +lcc +qIv +ryB wGM wGM wGM -wGM -wGM -wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc wjc wjc -wjc -jkE -wjc +coJ +qwv +nzi +xxx +spT +oTE +nzi +qEJ +coJ +coJ wjc wjc wjc @@ -36847,23 +36541,23 @@ vFG wjc wjc wjc -coJ -kbF -bdR -qSI -uxk -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc oFA tCW eph gYF -coJ -coJ -coJ -coJ -coJ +wjc +wjc +wjc +wjc +wjc coJ vFG vFG @@ -36926,19 +36620,19 @@ wjc wjc wjc wjc +jkE +vFG +vFG +vFG +vFG +vFG +fCu wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +lKl +mMB +yhP +icW +lKl wjc wjc wjc @@ -36983,30 +36677,30 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +xPR +ryB +kOm +rpu +vws +ryB wGM wGM wGM -wGM -wGM -wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc wjc wjc -wjc -wjc -vFG -wjc +coJ +xDu +nzi +llU +tXi +hZf +nzi +riR +coJ +coJ wjc wjc wjc @@ -37041,23 +36735,23 @@ vFG wjc wjc wjc -coJ -tIe -xml -xml -kct -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc coJ nxu huS faW -eKI -lXR -bPf -opE -dxS +wjc +wjc +wjc +wjc +wjc kvl vFG vFG @@ -37120,19 +36814,19 @@ wjc wjc wjc wjc +jkE +vFG +vFG wjc wjc wjc -wjc -wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +dzk +dzk +dzk +dzk +lKl wjc wjc wjc @@ -37177,30 +36871,30 @@ wKL wjc wjc wjc -wjc -wjc +coJ +pjd mWM +ryB +ryB +ryB +ryB +ryB wGM wGM wGM wGM -wGM -wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG wjc +coJ +coJ +sfg +eic +hdq +cmk +ltj +pnJ +awR +coJ +coJ wjc wjc wjc @@ -37235,23 +36929,23 @@ vFG wjc wjc wjc -coJ -rot -xml -ovx -jXT -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc coJ kBF pbY moO -kIl -dDm -ohJ -ioi -cAi +wjc +wjc +wjc +wjc +wjc hsB vFG vFG @@ -37314,19 +37008,19 @@ wjc wjc wjc wjc +jkE +vFG +vFG wjc wjc wjc -wjc -wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +qWi +uOJ +npR +uOJ +vFG wjc wjc wjc @@ -37371,29 +37065,29 @@ wjc wjc wjc wjc -wjc -wjc +coJ +pTI mWM +gTv +ryB +ryB wGM wGM wGM wGM wGM wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG +coJ +coJ +coJ +coJ +coJ +gYl +uBn +kzC +coJ +coJ +coJ wjc wjc wjc @@ -37429,23 +37123,23 @@ vFG wjc wjc wjc -coJ -gSK -xml -eBI -uke -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc coJ coJ fvf dMS -coJ -coJ -xjI -coJ -coJ +wjc +wjc +wjc +wjc +wjc jkE vFG vFG @@ -37508,13 +37202,13 @@ wjc wjc wjc wjc +omy +vFG +vFG wjc wjc wjc -wjc -wjc -wjc -wjc +fCu gEh gEh gEh @@ -37565,30 +37259,30 @@ wjc wjc wjc wjc -wjc -wjc +coJ +pTI mWM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -wjc +gTv +gTv +ryB +ryB +ryB +ryB +ryB +ryB +ryB +coJ +coJ +coJ +fON +hdy +gxF +viX +fAm +dUT +uBJ +coJ +coJ wjc wjc wjc @@ -37623,12 +37317,12 @@ vFG wjc wjc wjc -coJ -coJ -iVr -sZT -xSR -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc coJ @@ -37702,19 +37396,19 @@ wjc wjc wjc wjc +omy +vFG +vFG wjc wjc wjc -wjc -wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +dzk +cTj +cTj +cTj +lKl wjc wjc wjc @@ -37752,37 +37446,37 @@ hkB wre wre wre -wre -wre -wjc -wjc -wjc -wjc -wjc -wjc -wjc +iYi +iYi +coJ +coJ +coJ +coJ +coJ +coJ +pTI mWM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -wjc +gTv +gTv +gTv +gTv +ryB +ryB +ryB +ryB +ryB +coJ +coJ +coJ +lvY +asS +ibu +ygn +jlu +nzi +lZw +coJ +coJ wjc wjc wjc @@ -37817,12 +37511,12 @@ vFG wjc wjc wjc -pYo -coJ -xml -jiH -riv -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc coJ @@ -37896,19 +37590,19 @@ wjc wjc wjc wjc +jkE +vFG +vFG wjc wjc wjc -wjc -wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +dzk +bew +oSG +gUi +lKl wjc wjc wjc @@ -37945,38 +37639,38 @@ wjc wjc wjc wjc -wjc -wjc -wjc -vqJ -vqJ -vqJ -vqJ -vqJ -vqJ -vqJ +ffQ +bOa +rwg +eGo +sQF +sQF +sQF +sQF +sQF +caw mWM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -wjc +gTv +gTv +gTv +gTv +jjW +jjW +jjW +jjW +jjW +olR +olR +oeM +eWV +nzi +sca +fCl +qqM +nzi +lDQ +coJ +coJ wjc wjc wjc @@ -38011,12 +37705,12 @@ vFG wjc wjc wjc -rfh -sJK -nUt -gXy -qqz -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc qQV @@ -38090,19 +37784,19 @@ wjc wjc wjc wjc +jkE +jkE +vFG wjc wjc wjc -wjc -wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +dzk +tet +ydZ +vem +lKl wjc wjc wjc @@ -38139,38 +37833,38 @@ wjc wjc wjc wjc -wjc -wjc -wjc -vqJ -vqJ -vqJ -vqJ -vqJ -vqJ -vqJ +sGV +wya +sUS +snx +aaJ +aaJ +aaJ +aaJ +aaJ +caw mWM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -wjc +gTv +gTv +gTv +llM +llM +llM +llM +llM +llM +nZs +nZs +tBU +nzi +nzi +btb +teE +nWO +feT +gba +coJ +coJ wjc wjc wjc @@ -38205,12 +37899,12 @@ vFG wjc wjc wjc -lcc -coJ -rKt -pRV -kKj -coJ +wjc +wjc +wjc +wjc +wjc +wjc wjc wjc wjc @@ -38284,19 +37978,19 @@ vFG vFG vFG vFG +kAl vFG vFG wjc wjc wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +dzk +bvG +bbg +fUp +lKl wjc wjc wjc @@ -38333,38 +38027,38 @@ wjc wjc wjc wjc -wjc -wjc -wjc -vqJ -vqJ -vqJ -vqJ -vqJ -vqJ +vlr +vlr +vlr +kBR +nKh +kBR +eNH vqJ +fip +caw mWM -plg -plg -plg -plg -plg -plg -plg -wGM -wGM -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -wjc +mkl +mkl +mkl +mkl +mkl +mkl +mkl +ryB +gTv +pTI +pTI +coJ +wGB +gms +utM +omd +ezY +wGB +qLQ +coJ +coJ wjc wjc wjc @@ -38478,19 +38172,19 @@ vFG vFG vFG vFG +jkE vFG vFG wjc wjc wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +trX +mKC +bdF +fzp +lKl wjc wjc wjc @@ -38504,60 +38198,60 @@ uYk uYk uYk uYk -uYk -uYk -uYk -uYk -uYk -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +fgu +eVw +qqu +qqu +uDJ +wKL +giq +giq +giq +giq +giq +giq +giq aVZ eKD szg oNU -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vqJ -vqJ -vqJ -vqJ -vqJ -vqJ -vqJ -wmr +giq +giq +giq +giq +giq +giq +vlr +aiq +gJD +kEv +mwg +lmE +khy +fip +fip +caw +mWM +mkl iSZ jTl imA vmw wfl bnY -mkl ryB -oqR -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -jkE +ryB +qkX +pTI +vlr +fif +lJl +vlr +vlr +eng +ayM +coJ +coJ wjc wjc wjc @@ -38672,19 +38366,19 @@ vFG vFG vFG vFG +jkE vFG vFG wjc wjc wjc -wjc -wjc -gEh -gEh -gEh -gEh +fCu gEh -wjc +dzk +qIi +coV +mFZ +lKl wjc wjc wjc @@ -38698,61 +38392,61 @@ uYk uYk uYk uYk -uYk -uYk -uYk -uYk -uYk -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -aVZ +fgu +mrE +fIK +nUt +wKc +wKL +rfh +xml +xml +xml +xml +xml +xml +qja eKD ggC -oNU -wjc -wjc -wjc -wjc -wjc -wjc -vlr -vlr +sIN +hLZ +hLZ +hLZ +hLZ +hLZ +rwt vlr +iZa +vEp +kUt +mwg +hNd +tvu kBR -nKh -kBR -eNH -vqJ -vqJ -vqJ -wmr +fip +fip +pRw +mkl +mkl jrB sJN knd knd wfl -uoF -mkl daQ -gTv -coJ -coJ -coJ -coJ -coJ -coJ -coJ -coJ +ryB +pjd +pTI +vlr +jsJ +tey +kIu +eYc +vlr +tlE +vOA coJ coJ -jkE -wjc wjc wjc wjc @@ -38866,19 +38560,19 @@ vFG vFG vFG vFG +jkE +kAl vFG -vFG -wjc -wjc wjc wjc wjc +fCu wjc -gEh -gEh -gEh -wjc -wjc +dzk +voZ +gcA +pHw +lKl wjc wjc wjc @@ -38892,61 +38586,61 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -qja -eKD -ggC -wjc -wjc -wjc -wjc -wjc -wjc -wjc +slc +qqB +qTf +wqI +rtT +dXb +rfh +xml +xml +xml +xml +xml +xml +fLt +fLt +fLt +xml +xml +xml +xml +xml +lAA +jas vlr -aiq -gJD -kEv +mjc +kzJ +kUt mwg -lmE -khy -vqJ -vqJ -vqJ -wmr +eDI +bwZ +kBR +cdz +vNt +ubu +rhS +mkl esG esG esG kcx esG -esG -mkl kxm -wbI +ryB +oQS +wgh +fwY +nAt +nzi +uoN +iBd +vlr +vlr vlr -uOa -ftQ -fMD -jPj -erM -aoS -iUd coJ coJ -jkE -wjc wjc wjc wjc @@ -38991,7 +38685,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -39060,9 +38754,21 @@ wjc wjc vFG vFG +jkE +omy vFG vFG +vFG +vFG +fCu wjc +lKl +oIU +utN +pHw +lKl +vFG +vFG wjc wjc wjc @@ -39074,73 +38780,61 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -piI -blI -cfj -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vlr -iZa -vEp +wKL +ffu +tjr +wKL +wKL +wKL +rfh +xml +jas +oqR +oqR +oqR +oqR +pFn +pFn +pFn +oqR +oqR +oqR +oqR +rfh +lAA +jas +fgD +jJl +gqB kUt -mwg -hNd -tvu -vqJ -vqJ -vqJ -wmr +pZp +jJZ +faf +kBR +dSS +fNk +jQq +lYT +mkl czU sYw cXs rPO iED -pin -mkl juV -klv -bqC -sUf -dun -dun -inx -aoS -aoS -ngJ +tWk +hEP +pTI +vlr +hKh +cuM +fXG +uDY +vlr +qrn +vVj coJ coJ -jkE -wjc wjc wjc wjc @@ -39185,7 +38879,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -39260,19 +38954,15 @@ vFG jkE vFG nCo -nCo fYv +aWP tCS -wqI -gRy -gRy -gRy -fCu -fCu -wjc -wjc -wjc +tCS +ckf +lLf +kga wjc +fCu wjc wjc wjc @@ -39284,57 +38974,61 @@ wjc wjc wjc wjc +wKL +swq +nzi +wKL wjc wjc vkE oQo sEh -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +giq +giq +giq +giq +giq +giq +giq +giq +giq +giq +giq vkE oQo sEh -vlr -mjc -kzJ -kUt -mwg -eDI -bwZ -vqJ -vqJ -vqJ +dRL +cuA +cuA +mJI +luI +aSr +nEU +ptH +oPO +wHy wmr +ndA +mkl mEP ire gYQ sZK bvw -dIZ -rOX xNy -klv -vlr -nIS -dun -dun -viO -qWI -clW -kcw -mgb -jkE -jkE -wjc +owH +xOx +pTI +ngI +tBR +eVR +cPK +qmI +dHf +kYD +kYD +coJ +coJ wjc wjc wjc @@ -39379,7 +39073,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -39453,20 +39147,16 @@ wjc vFG kAl jkE -iYi rix fYv -nLo +aWP +tCS wQg ntG -gRy +yaJ kga -cmk -fCu -wjc -wjc -wjc wjc +fCu wjc wjc wjc @@ -39478,6 +39168,10 @@ wjc wjc wjc wjc +wKL +ttX +wni +wKL wjc wjc rSn @@ -39497,38 +39191,38 @@ wjc rSn ksT nLK -fgD -jJl -gqB -kUt -pZp -jJZ -faf -vqJ -vqJ -vqJ -wmr +ykQ +cuA +cuA +uxC +ulu +uxC +uxC +rNK +fEj +fNk +jQq +xEP +mkl pnr rPO fiT mbE lkB -fTV -xPR qkT -oQH -drl -rhf -rhf -rhf -gZU -sbK -mNJ -qan -lox -jkE -jkE -wjc +esO +kGo +kdP +vlr +rHc +bKw +kFL +xFI +vlr +lAk +nzi +coJ +coJ wjc wjc wjc @@ -39573,7 +39267,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -39648,14 +39342,14 @@ jkE jkE vFG nCo -nCo fYv -dFd +aWP +tCS rjc nPK -gRy -wgh -bew +cHF +kga +kWy cdC cdC cdC @@ -39668,10 +39362,10 @@ uYk uYk wjc wjc -wjc -wjc -wjc -wjc +wKL +sMf +pgA +wKL wjc wjc wtL @@ -39691,38 +39385,38 @@ wjc wtL xMQ hwn -dRL +vlr +bVc cuA +vNc +rqf +hFq cuA -lKT -nJr -pgN -fmE -wjc -wjc -wjc -wmr +vlr +tZC +fKm +qsd +bhZ +mkl fls rPO rPO rPO rUI -jNJ -tOX -xNy -klv +nti +fKv +xOx +pTI +fwY +xNV +dgE +yjM +ieM vlr -wJt -oqN -tfV -xah -dKK -ylI -iOe +knD +gbV coJ coJ -jkE -wjc wjc wjc wjc @@ -39767,7 +39461,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -39842,13 +39536,13 @@ vFG jkE vFG nCo -nCo fYv +aWP vuG ooC dkB -gRy -muz +vrX +kga kWy cdC eeI @@ -39862,10 +39556,10 @@ uYk uYk wjc wjc -wjc -wjc -wjc -wjc +wKL +wKL +wKL +wKL wjc wjc rlU @@ -39885,38 +39579,38 @@ wjc rlU wzI orD -ykQ -cuA -cuA -cuA -xSH -cuA -cuA -wjc -wjc wjc -wmr +vlr +bmp +vlr +vlr +vlr +vlr +iRT +aMT +ezu +mDr +axe +mkl uOD knd knd knd knd -mRe -sIN -juV +bUa klv +hEP +pTI vlr +jUO +giY +cQg +laM vlr -vlr -vlr -vlr -vlr -vlr -vlr +tlE +kmo coJ coJ -vFG -wjc wjc wjc wjc @@ -39961,7 +39655,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -40037,13 +39731,13 @@ mqS mqS mqS mqS -mqS +dwp gYA dby gRy gRy kEu -cdC +kWy cdC iJD tyc @@ -40079,38 +39773,38 @@ wjc xod wye lIK -vlr -bVc -hFq -vNc -rqf -wRx -vlr -wjc -wjc wjc -wmr +wRx +wRx +wRx +wRx +wRx +wRx +coJ +yfP +yfP +gvu +pLv +mkl rxJ ghe pxG knd knd -bOa -mkl -juV -klv -vlr -pGX -ubo -kXU -wBX -cFv -hhD -vQs +kBd +tWk +hEP +pTI +coJ +ppt +coJ +lJl +coJ +coJ +coJ coJ -fiH qRL -wjc +coJ wjc wjc wjc @@ -40155,7 +39849,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -40274,37 +39968,37 @@ wtL jSS wpe vlr -vlr -vlr -vlr -vlr -bmp -vlr -wjc -wjc -wjc -wmr +wRx +wRx +wRx +wRx +wRx +wRx +coJ +phH +kcV +mow +mkl +mkl mkl mkl mkl vfK cip -fjr -mkl -juV +txR tWk +hEP +oQW vlr -dhA -dhA -rko -dhA -dhA -dhA -tRU -coJ +pGX +ubo +kXU +wBX +cFv +hhD +vQs coJ -vFG -wjc +fiH wjc wjc wjc @@ -40349,7 +40043,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -40467,34 +40161,36 @@ wjc wtL eKD fyh -vFG -vFG -vFG -vFG -pRK +vlr +wRx +wRx +wRx +rQZ +cDW pRK -iWR lik -pRK -pRK +lik +lik +lik +lik xvA -mFZ -xHo -mkl -mkl +xDo +wAB mkl mkl mkl -llM -qmt +tWk +tWk +dah +nFF vlr -olj -qgx -mnb -naO -aHr -aWq -aWk +dhA +dhA +rko +dhA +dhA +dhA +tRU coJ coJ wjc @@ -40508,22 +40204,20 @@ wjc wjc wjc wjc -wjc -wjc lCW lCW lCW lCW -iSt -wQE -lMN -sFq -cWS -gCm -khO -coJ -fTz -man +lCW +lCW +lCW +lCW +nHe +nHe +wjc +wjc +wjc +wjc wjc wjc vFG @@ -40543,7 +40237,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -40661,13 +40355,15 @@ wjc wtL eKD nXQ -vFG -vFG -vFG -vFG -pRK +vlr +wRx +wRx +wRx +rQZ +cDW msa lYO +lYO vDu uMI boa @@ -40677,18 +40373,18 @@ adV vgu pcq joV -qOX -pRK -exM -klv +eBc +grc +pjd +pTI vlr -xaC -hQH -hum -nSs -oaO -tGm -lzG +olj +qgx +mnb +naO +aHr +aWq +aWk coJ coJ wjc @@ -40702,22 +40398,20 @@ wjc wjc wjc wjc -wjc -wjc lCW lCW lCW lCW -iSt -qEJ -jas -jQq -rLT -vjl -uMo -coJ -bCK -coJ +lCW +lCW +lCW +lCW +nHe +nHe +wjc +wjc +wjc +wjc wjc wjc vFG @@ -40737,7 +40431,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -40855,13 +40549,15 @@ wjc cvJ iAe ibX -vFG -vFG -vFG -vFG -pRK +vlr +wRx +wRx +wRx +rQZ +cDW nbM fcD +fcD dzB nsH mQR @@ -40871,18 +40567,18 @@ fll nkO rMp fSP -wni -pRK -exM -klv -vlr -cCC -vlr -aEF -vlr +xfA +grc +pjd +pTI vlr -gIa -eou +xaC +hQH +hum +nSs +oaO +tGm +lzG coJ coJ wjc @@ -40896,22 +40592,20 @@ wjc wjc wjc wjc -wjc -wjc lCW lCW lCW lCW -iSt -mxd -sEK -lhs -rtT -ucL -wUd -mgb -esO -pWM +lCW +lCW +lCW +lCW +nHe +nHe +wjc +wjc +wjc +wjc wjc wjc vFG @@ -40931,7 +40625,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -41049,13 +40743,15 @@ wjc sfl eKD ggC -vFG -vFG -vFG -vFG +bqC +wRx +wRx +wRx rQZ +cDW qae fyk +fyk dzB fGu qaF @@ -41065,18 +40761,18 @@ jaC aFl kwP wKj -iam -pRK -exM -klv -fwY -wOi -gCN -nsk -vbi +cWS +grc +pjd +pTI +vlr +cCC +vlr +aEF +vlr vlr kCQ -vUZ +eou coJ coJ wjc @@ -41090,22 +40786,20 @@ wjc wjc wjc wjc -wjc -wjc nHe lCW nHe nHe -jND -bvG -mGz -vcI -cWS -ulu -mJI -voZ -qLQ -iLP +nHe +nHe +lCW +lCW +nHe +nHe +wjc +wjc +wjc +wjc wjc wjc vFG @@ -41125,7 +40819,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -41243,13 +40937,15 @@ wjc kFd eKD ggC -vFG -vFG -vFG -vFG -pRK +vlr +fwY +aOY +uPo +cDW +cDW gfi fyk +fyk dzB vnG pRK @@ -41259,18 +40955,18 @@ rqL brV brV pRK -pRK -pRK -exM -klv -vlr -cRj -hte -hOC -msz -bpV +grc +grc +pjd +pTI +fwY +wOi +gCN +nsk +vbi sZT -doY +sZT +vUZ coJ coJ wjc @@ -41284,22 +40980,20 @@ wjc wjc wjc wjc -wjc -wjc nHe nHe nHe nHe -jND -cWS -jAu -cWS -cWS -nnD -rff -coJ -pjd -pTI +nHe +nHe +lCW +nHe +nHe +nHe +wjc +wjc +wjc +wjc wjc wjc vFG @@ -41319,7 +41013,7 @@ vFG vFG vFG vFG -vFG +coJ vFG vFG vFG @@ -41437,34 +41131,36 @@ wjc cJA eKD ggC -vFG -vFG -vFG -vFG -sRb +uoF +hLZ +hLZ +hLZ +oMD +oMD mjh pLG +pLG cqW -oMD -gba +dyA +udc auh gXB bOL qFq rrW eXk -pJR -cdV eAf rfn -swE -pBU -raJ -fXa -eFD -wFw -pBd -vaG +rqa +qkX +vlr +cRj +hte +hOC +msz +sZT +sZT +doY coJ coJ wjc @@ -41478,22 +41174,20 @@ wjc wjc wjc wjc -wjc -wjc nHe nHe nHe nHe -jND -onm -onm -jCb -thP -thP -eXp -coJ -lbN -tqK +nHe +nHe +nHe +nHe +nHe +nHe +wjc +wjc +wjc +wjc wjc wjc vFG @@ -41631,34 +41325,36 @@ wjc fUW eKD ggC -vFG -vFG -vFG -vFG -qUa +tfX +oqR +oqR +oqR +mmr +mmr czS ydc +ydc esn -mmr -lxM +xHT +lwy klb oGt jvN sZw oOR bCR -bvq -ffQ fwa mfU -fAs -mrG -kmn -bfw -ylm -mfc -iVW -mBW +wpx +pnI +swE +pBU +raJ +fXa +eFD +wFw +pBd +vaG coJ coJ wjc @@ -41672,33 +41368,31 @@ wjc wjc wjc wjc -wjc -wjc nHe nHe nHe nHe -jND -pAN -thP -thP -kGR -udc -kBd -fwY -vrX -lEt +nHe +nHe +nHe +nHe +nHe +nHe wjc wjc -uDJ -nZs -llc -ndA -rwt -wnE -shK -qsz -qsz +wjc +wjc +wjc +wjc +buj +buj +buj +buj +buj +buj +buj +buj +buj vFG vFG vFG @@ -41825,14 +41519,16 @@ wjc eDr har ttV -vFG -vFG -vFG -vFG +vlr +vlr +vlr +vlr +pRK pRK bnd dsM -cDK +kFc +nkn iWf ehm rGM @@ -41841,18 +41537,18 @@ dtQ kaZ ehm dtQ -eSr -ehm exM -klv -vlr -djy -oOt -dqk -bWr -chS -xml -wnq +grc +pjd +pTI +fAs +mrG +kmn +bfw +ylm +mfc +iVW +mBW coJ coJ wjc @@ -41866,33 +41562,31 @@ wjc wjc wjc wjc -wjc -wjc nHe nHe nHe nHe -jND -onm -onm -onm -rhS -wHy -dyA -coJ -rtd -snx +nHe +nHe +nHe +nHe +nHe +nHe +wjc +wjc +wjc +wjc wjc wjc -jvm -aBI -fBq buj -niA -gAT -fPx -qsz -qsz +buj +buj +buj +buj +buj +buj +buj +buj vFG vFG vFG @@ -42023,30 +41717,32 @@ pRK ryZ uRr ryZ +ryZ pRK wIB dpA -eUw -hNZ +mLp hPX +hNZ +sUT ryo ehm -hPX -wmf -ehm -hPX +sUT wmf ehm -exM -klv -fwY -enY -gsz -rST -lZM -vlr -nEU +sUT +ixk +grc +pjd +pTI vlr +djy +oOt +dqk +bWr +xml +xml +wnq coJ coJ wjc @@ -42060,33 +41756,31 @@ wjc wjc wjc wjc -wjc -wjc nHe nHe nHe nHe -jND -jND -jND -jND -jND -jND -coJ -coJ -pjd -pTI +nHe +nHe +nHe +nHe +nHe +nHe wjc wjc -txR -gAT -nxt -feh -xQE -gAT -dSS -qsz -qsz +wjc +wjc +wjc +wjc +buj +buj +buj +buj +buj +buj +buj +buj +buj vFG vFG vFG @@ -42217,10 +41911,12 @@ mxz sYq mbx ptB +ptB vcl gbX abo -eiD +vOk +byd hNZ dgl igf @@ -42229,18 +41925,18 @@ knW qaT kHI knW -ibu -axe tdp gup +sJm +pRV +fwY +enY +gsz +rST +lZM +chS +chS vlr -ppt -vlr -lJl -vlr -vlr -eng -ayM coJ coJ wjc @@ -42254,8 +41950,6 @@ wjc wjc wjc wjc -wjc -wjc nHe nHe nHe @@ -42272,15 +41966,15 @@ wjc wjc wjc wjc -gvu -gAT -ixk -jsr -jlu -jaJ -hBs -qsz -qsz +buj +buj +buj +buj +buj +buj +buj +buj +buj vFG vFG vFG @@ -42411,10 +42105,12 @@ pRK tGo ucb sYq +sYq ptq mfY eAk -aKz +dXK +swb ehm bTZ tlm @@ -42423,22 +42119,20 @@ nie tlm ehm tuG -tlm -ehm njR -riR -vlr -jsJ -tey -kIu -eYc +grc +eXp +wWE +coJ +coJ +coJ +coJ +coJ vlr -tlE -vOA coJ coJ -wjc -wjc +coJ +coJ wjc wjc wjc @@ -42466,15 +42160,15 @@ wjc wjc wjc wjc -eGo -aOY -shl -rck -ltj -xfA -rwg -qsz -qsz +buj +buj +buj +buj +buj +buj +buj +buj +buj vFG vFG vFG @@ -42531,15 +42225,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +fPx +fPx +vjB vFG vFG vFG @@ -42605,11 +42299,11 @@ pRK naI gTX wCV -pRK +wCV +grc fHD -npR -lxo -lxo +nLo +nLo lxo lxo lxo @@ -42619,16 +42313,18 @@ eoE eoE eoE eoE -uBJ -klv -fwY -nAt -nzi -uoN -iBd -vlr -vlr +grc +grc +sRb +pTI vlr +uOa +ftQ +fMD +jPj +erM +aoS +iUd coJ coJ wjc @@ -42642,8 +42338,6 @@ wjc wjc wjc wjc -wjc -wjc hie hie hie @@ -42660,14 +42354,14 @@ wjc wjc wjc wjc -mJk -mJk -fhP -vfS -bOp -mJk -mJk -mJk +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS wjc vFG vFG @@ -42725,15 +42419,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +pBA +fZL +vjB vFG vFG vFG @@ -42799,30 +42493,32 @@ pRK tGo sYq sYq -oeM +sYq +jAu lxp -sfg +ijr +ijr lxo gZJ riH mFM wSh -uPD -lxo +aKz +eoE elT qjm -gZK -eoE -exM -kdP -vlr -hKh -cuM -fXG -uDY -vlr -qrn -vVj +nhk +grc +pjd +oKB +bqC +sUf +dun +dun +inx +aoS +aoS +ngJ coJ coJ wjc @@ -42836,8 +42532,6 @@ wjc wjc wjc wjc -wjc -wjc hie hie hie @@ -42854,15 +42548,15 @@ wjc wjc wjc wjc -dIC -wFN -tTL -aHL -ubu -hbv -ccQ -mJk -mJk +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS vFG vFG vFG @@ -42919,15 +42613,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +rfh +mPi +vjB vFG vFG vFG @@ -42993,34 +42687,34 @@ pRK nvC luE lkW -pRK +lkW +grc lxp -grM +aFu +aFu fqw fMj iVu tos -bGk -kwx +vfS +jND jVx kmz hPQ -fNk -lLf bgj oQH -ngI -tBR -eVR -cPK -qmI -dHf -kYD -kYD -coJ -coJ -wjc -wjc +beS +kdP +vlr +nIS +dun +dun +viO +qWI +clW +kcw +mgb +jkE wjc wjc wjc @@ -43048,15 +42742,15 @@ wjc wjc wjc wjc -fKv -pAI -wGB -aHL -swb -kzC -vUy -mJk -mJk +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS vFG vFG vFG @@ -43113,15 +42807,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +rfh +lxM +vjB vFG wjc wjc @@ -43188,33 +42882,33 @@ pRK pRK pRK pRK +grc oOZ -lOP +lhs +lhs lxo uKf pPe nwd pUv -wzQ -lxo +dvB +eoE bVK fhO -bVK -eoE -exM -klv -vlr -rHc -bKw -kFL -xFI -vlr -lAk -nzi -coJ -coJ -wjc -wjc +uga +grc +pjd +pTI +drl +rhf +rhf +rhf +gZU +sbK +mNJ +qan +lox +jkE wjc wjc wjc @@ -43242,15 +42936,15 @@ vFG vFG vFG vFG -asS -rBm -umL -aHL -trX -rBm -mGW -mJk -mJk +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS vFG vFG vFG @@ -43307,15 +43001,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +rfh +wES +vjB vFG wjc wjc @@ -43377,34 +43071,36 @@ wjc xod wye lIK +grc rzj esg iiz qhI grc lxp -lDQ +adl +adl aNV wuQ wuQ vVU iNU -tMv -lxo +ggs +eoE uMW qYQ -rpu -eoE cUC -klv -fwY -xNV -dgE -yjM -ieM +grc +sJK +pTI vlr -knD -gbV +wJt +oqN +tfV +xah +dKK +ylI +iOe coJ coJ wjc @@ -43418,8 +43114,6 @@ wjc wjc wjc wjc -wjc -wjc hie hie hie @@ -43436,15 +43130,15 @@ vFG vFG vFG vFG -axq -rBm -sca -gxF uFS -rBm -ery -mJk -mJk +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS vFG vFG vFG @@ -43501,15 +43195,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +cil +jGV +vjB vFG wjc wjc @@ -43571,49 +43265,49 @@ wjc wtL jSS wpe +grc seX hxR sCA tsO aTD joo -gav +iSt +iSt lxo cbf laG eDG -mSY -kwx +rVx +jND rOb oAS iAE -qsd -fwO -exM -klv +pmq +hbv +pjd +pTI +vlr +vlr +vlr +vlr +vlr +vlr +vlr +vlr vlr -jUO -giY -cQg -laM vlr -tlE -kmo -coJ -coJ -wjc -wjc -wjc -wjc -wjc wjc wjc wjc wjc wjc wjc +vlr wjc wjc +vlr +vlr hie hie hie @@ -43630,15 +43324,15 @@ vFG vFG vFG vFG -bDv -uga -xDu -uOJ -bFt -rwE -uII -mJk -mJk +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS +uFS vFG vFG vFG @@ -43695,15 +43389,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +tJL +qxO +ktS +wKL +nDp +vcK +bMS +nfV +vjB vFG wjc wjc @@ -43765,34 +43459,36 @@ wjc wtL eKD fyh +grc uHZ yaR iXr jvi wEU iSL -rxU +thb +thb fqw smu iVu odr odr -wES -lxo +afH +eoE xtn wcB -oQW -eoE sDU -noF -coJ -fif -coJ -lJl -coJ +grc +pWA +lEt +vlr +iSJ +wTt +jwJ coJ coJ coJ +pbu coJ coJ wjc @@ -43806,8 +43502,6 @@ wjc wjc wjc wjc -wjc -wjc hie hie hie @@ -43824,15 +43518,15 @@ vFG vFG vFG vFG -isW -isW -isW -fON -isW -isW -isW -isW -isW +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL vFG vFG vFG @@ -43889,15 +43583,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +mPV +iVW +rua +iLT +uiL +xml +xml +jRA +isW vFG wjc wjc @@ -43959,38 +43653,38 @@ wjc wtL eKD nXQ +grc uHZ tlt oqT aFg grc lxp -ogo +jJg +jJg lxo sEw gTF xJc odr -hdq -lxo +shQ +eoE aOb gWI -byd -eoE -exM -dXK +wzQ +grc qsz -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +uMo +vlr +iSJ +nVN +fju +coJ +coJ +pgF +tYA +pgF +coJ wjc wjc wjc @@ -44018,15 +43712,15 @@ vFG vFG vFG vFG -isW -isW -jhV uxL -aEf -jEE -isW -isW -isW +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL vFG vFG vFG @@ -44083,15 +43777,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +vjl +cdV +rjp +wKL +rfh +fEK +xml +uob +isW vFG wjc wjc @@ -44154,37 +43848,37 @@ cvJ iAe ibX grc +grc lSP bli grc grc lxp -sfg +ijr +ijr lxo lxo bAz lxo lFs -lxo -lxo eoE eoE eoE eoE -rdy -bMS +grc +grc aWC -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +eYj +vlr +vtg +sIb +gPW +coJ +coJ +pgF +tjr +pgF +coJ wjc wjc wjc @@ -44212,15 +43906,15 @@ vFG vFG vFG vFG -isW -isW -cyv -vov -fUp -isW -isW -isW -isW +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL vFG vFG vFG @@ -44277,15 +43971,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +sGD +iSr +vjB vFG wjc wjc @@ -44336,12 +44030,12 @@ ggC wjc wjc wjc -beS -mRS -fhg -fhg -yaJ -beS +ofb +ofb +ofb +ofb +ofb +ofb wjc wjc sfl @@ -44352,8 +44046,10 @@ wLu kpy qgE tiK +tiK vvP bKj +bKj jXs aKU qUi @@ -44365,20 +44061,18 @@ lKc fOO oYB yhT -lvY -sat fXd -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +jdy +xUA +eMM +tEz +iSJ +coJ +coJ +dVe +pJK +pgF +coJ wjc wjc wjc @@ -44406,15 +44100,15 @@ vFG vFG vFG vFG -isW -isW -isW -pIG -isW -isW -isW -isW -isW +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL vFG vFG vFG @@ -44471,15 +44165,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +rfh +iSr +vjB vFG wjc wjc @@ -44530,12 +44224,12 @@ ggC wjc wjc wjc -beS -omd -uPo ofb -tzE -beS +ofb +ofb +ofb +ofb +ofb wjc wjc kFd @@ -44546,8 +44240,10 @@ eMJ eMH eMH eMH +eMH eMJ uyH +uyH shT eMH mnT @@ -44559,20 +44255,18 @@ sbB fQP dZa uyg -wPf -wex -qsz -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +tbT +duB +vlr +sCc +hvt +fju +coJ +coJ +coJ +coJ +coJ +coJ wjc wjc wjc @@ -44600,14 +44294,14 @@ vFG vFG vFG vFG -isW -isW -isW -isW -isW -isW -isW -isW +uxL +uxL +uxL +uxL +uxL +uxL +uxL +uxL wjc vFG vFG @@ -44665,15 +44359,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +tOX +ksu +vjB vFG wjc wjc @@ -44722,46 +44416,46 @@ qja eKD ggC wjc -wjc -wjc -wvw +xml +xml fsq -fIK -mof -cDW -pZd -wjc -wjc -qja -eKD -ggC -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +fsq +fsq +fsq +fsq +fsq +xml wjc +vkE +oQo +sEh +vlr +vlr +vlr +vlr +vlr +vlr +vlr +vlr +coJ +coJ +coJ +vlr +vlr +vlr +vlr +vlr +vlr +vlr +vlr +coJ +coJ +coJ +coJ +iSJ wjc +iSJ +coJ wjc wjc wjc @@ -44859,15 +44553,15 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wKL +bGk +vjB vFG wjc wjc @@ -44916,22 +44610,20 @@ piI blI cfj wjc +xml +xml +fsq +fsq +fsq +fsq +fLt +fLt +xml wjc -wjc -beS -smw -sJp -beS -fNe -fNe -wjc -wjc -piI -blI -cfj -wjc -wjc -wjc +qja +gqX +ggC +giq wjc wjc wjc @@ -44949,6 +44641,8 @@ wjc wjc wjc wjc +vlr +vlr wjc wjc wjc @@ -45110,27 +44804,24 @@ vkE oQo sEh wjc +xml +xml +fsq +fsq +fsq +fsq +xml +xml +xml wjc -wjc -beS -sUT -jRA -beS +qja +gqX +ggC +mRe wjc wjc wjc wjc -vkE -oQo -sEh -hou -rxu -bXx -sOg -aoS -aoS -irH -hou wjc wjc wjc @@ -45145,6 +44836,9 @@ wjc wjc wjc wjc +coJ +coJ +coJ wjc wjc wjc @@ -45304,27 +44998,27 @@ rSn ksT nLK wjc +xml +xml +fsq +fsq +fsq +fsq +xml +xml +xml +wjc +qja +gqX +ggC +mRe +wjc wjc wjc -beS -ulX -teE -beS wjc wjc wjc wjc -rSn -ksT -nLK -hou -gCI -aoS -wMo -wGI -vtX -awT -hou wjc wjc wjc @@ -45500,10 +45194,10 @@ hwn wjc wjc wjc -beS -mrE -uBn -beS +ofb +ofb +ofb +ofb wjc wjc wjc @@ -45512,12 +45206,12 @@ wtL xMQ hwn giq -ebN -aoS -aoS -aoS -tdE -pvv +giq +giq +giq +giq +tlN +hou giq wjc wjc @@ -45694,10 +45388,10 @@ orD wjc wjc wjc -nes -nes -nes -nes +pPr +pPr +pPr +pPr wjc wjc wjc @@ -45706,13 +45400,13 @@ rlU wzI orD hou -dpF +rxu +bXx +sOg aoS -bKe -wGI -pMh -kcl -hou +aoS +irH +giq wjc wjc wjc @@ -45771,13 +45465,13 @@ vFG vFG vFG vFG -gZF -qkX -tsP -tsP -qwv -syh -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -45899,13 +45593,13 @@ wjc xod wye lIK -giq -yiB -aoS -bKe +hou +gCI aoS -tdE -wsT +wMo +wGI +vtX +awT giq wjc wjc @@ -45965,13 +45659,13 @@ vFG vFG vFG vFG -oTE -iLT -oKB -iSr -wym -cil -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -46094,12 +45788,12 @@ wtL jSS wpe giq -xXC -xTI -xTI -dLw +ebN +aoS +aoS +aoS tdE -mOk +pvv giq wjc wjc @@ -46159,13 +45853,13 @@ vFG vFG vFG vFG -qTf -wuV -cax -bdF -rQx rRV -tsP +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -46287,13 +45981,13 @@ wjc wtL eKD fyh -giq -iti -iTd -iTd -jjD -tdE -pIJ +hou +dpF +aoS +bKe +wGI +pMh +kcl giq wjc wjc @@ -46353,13 +46047,13 @@ vFG vFG vFG vFG -vzq -nWO -vzq -vzq -xDo -cTj -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -46482,12 +46176,12 @@ wtL eKD nXQ giq -iti -iTd -iTd -jjD +yiB +aoS +bKe +aoS tdE -xnG +wsT giq wjc wjc @@ -46547,13 +46241,13 @@ vFG vFG vFG vFG -qqB -wAB -qqB -qqB -hZf -qqB -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -46676,12 +46370,12 @@ cvJ iAe ibX giq -xjf -wVH -jPY -mow -xxx -aoS +xXC +xTI +xTI +dLw +tdE +mOk giq wjc wjc @@ -46741,13 +46435,13 @@ vFG vFG vFG vFG -qqB -lAc -qqB -qqB -uiL -qqB -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -46870,12 +46564,12 @@ sfl eKD ggC giq -giq -giq -giq -giq -tlN -hou +iti +iTd +iTd +jjD +tdE +pIJ giq wjc wjc @@ -46935,13 +46629,13 @@ vFG vFG vFG vFG -qqB -lYT -kOm -qqB -vJD -qqB -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -47064,22 +46758,13 @@ kFd eKD ggC eud -eud -eud -eud -eud -eud -eud -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +unc +wqn +wqn +khO +kYq +uPD +giq wjc wjc wjc @@ -47097,7 +46782,6 @@ jkE jkE jkE jkE -jkE xqe gkv xqe @@ -47109,6 +46793,16 @@ jkE jkE jkE jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -47129,13 +46823,13 @@ wjc wjc wjc wjc -jfT -tet -qqB -qqB -tet -qaD -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -47258,23 +46952,13 @@ cJA eKD ggC eud -dEO -iwj -cmF -vvs -oRu -eud -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +aMt +fDp +kJd +wnE +hWA +bDv +giq wjc wjc wjc @@ -47303,6 +46987,16 @@ cde cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG jkE jkE @@ -47323,13 +47017,13 @@ wjc wjc wjc wjc -rqa -qqB -qqB -qqB -qqB -qqB -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -47452,23 +47146,13 @@ fUW eKD ggC eud -bGL -nhD -tEg -wfu -ieR eud -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +eud +eud +eud +eud +eud +giq wjc wjc wjc @@ -47497,6 +47181,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -47517,13 +47211,13 @@ wjc wjc wjc wjc -lQH -sMf -lQH -lQH -sMf -lQH -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -47632,25 +47326,25 @@ eDr har ttV wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc eDr har ttV eud -uIj -qWf -fgC -qWf -pCt +dEO +iwj +cmF +vvs +oRu eud wjc wjc @@ -47663,16 +47357,6 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc vFG umW dPl @@ -47691,6 +47375,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc xJN vFG vFG @@ -47711,13 +47405,13 @@ wjc wjc wjc wjc -tsP -tsP -tsP -tsP -tsP -tsP -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -47826,25 +47520,25 @@ vmH drx pWy wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc vmH drx pWy eud -teR -tEg -tEg +bGL +nhD tEg -lGl +wfu +ieR eud wjc wjc @@ -47857,16 +47551,6 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc vFG umW dPl @@ -47885,6 +47569,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -47905,13 +47599,13 @@ wjc wjc wjc wjc -tsP -tsP -tsP -tsP -tsP -tsP -tsP +rRV +rRV +rRV +rRV +rRV +rRV +rRV vFG vFG vFG @@ -48020,47 +47714,37 @@ qja eKD ggC wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc qja eKD ggC eud -vNt -lJy -dKE -jJg -aWJ +uIj +qWf +fgC +qWf +pCt eud gFf bAl bAl nHR rIH -jkE -vFG -vFG -vFG -vFG -vFG -vFG -jkE -vFG -vFG vFG vFG -jkE -vFG -vFG -omy +wjc +wjc +wjc +wjc vFG umW dPl @@ -48079,6 +47763,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -48214,47 +47908,37 @@ piI blI cfj wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc piI blI cfj eud -sKe -rrG -wya -hEP -sKe +teR +tEg +tEg +tEg +lGl eud gFf ePH bAl nHR rIH -jkE -vFG -vFG -vFG -xEP -vFG -vFG -jkE -vFG -vFG -vFG -vFG -jkE vFG vFG -omy +wjc +wjc +wjc +wjc vFG umW dPl @@ -48273,6 +47957,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -48422,40 +48116,30 @@ vkE oQo sEh sqQ -sqQ -sqQ -xVr -sqQ -sqQ +eiD +wUd +grM +dKE +uQL sqQ kep ePH bAl kyn rIH -iyF -rIH -rIH -rIH -rIH -rIH -rIH -iyF -rIH -iyF -rIH rIH rIH -iAM -vFG -omy -vFG -umW -cde -cOW -vFG -umW -dPl +drw +drw +drw +drw +hCb +ahK +gAT +liw +hCb +ahK +wkw cOW vFG umW @@ -48467,6 +48151,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -48617,39 +48311,29 @@ ksT nLK sqQ eNR -lMx -xVr -lMx -mEN +hGe +wFN +ccQ +eNR sqQ lWt ePH ebc nHR drw -nHR -hGR -mps -nHR -nHR -nHR -nHR -nHR -hWA -rnP tTC bLz iyF -vFG -vFG -omy -vFG -umW -dPl -cOW -vFG -umW -cde +drw +drw +drw +hCb +ahK +wkw +liw +hCb +ahK +gAT cOW vFG umW @@ -48661,6 +48345,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -48812,7 +48506,7 @@ hwn sqQ sqQ sqQ -nPz +xVr sqQ sqQ sqQ @@ -48820,30 +48514,20 @@ mTU rWH rWH rWH -rWH -rWH -rWH -jCl -rWH -rWH -rWH -rWH -pXB -mPi -liw +drw jTq clo rIH -jkE -jkE -omy -vFG -umW -dPl -cOW -vFG -umW -dPl +drw +drw +drw +hCb +ahK +wkw +liw +hCb +ahK +wkw cOW vFG umW @@ -48855,6 +48539,16 @@ cde cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -49016,31 +48710,21 @@ myQ myQ myQ mIH -mIH -mIH -mIH -mIH -xlH -xlH -xlH -xlH +dTF +dKF +dKF +dKF +xUj +jvm +nIh +sQR xlH -jjW -ktS -mkJ -mkJ -mkJ -mkJ -vFG -umW -dPl -cOW -vFG -umW -dPl -cOW -vFG -umW +hCb +ahK +wkw +liw +hCb +ahK dPl cOW vFG @@ -49049,6 +48733,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -49211,30 +48905,20 @@ cVe myQ siq gIt -men +dKF wTG -mIH -lJV +nvw +xUj wWd -gTg -bhZ +nIh +sQR xlH -hUD +hCb +ahK +wkw +liw +hCb ahK -mkJ -kJd -caw -mkJ -iAM -umW -dPl -cOW -vFG -umW -dPl -cOW -vFG -umW dPl cOW vFG @@ -49243,6 +48927,16 @@ dPl cOW lKK xqe +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc jkE jkE jkE @@ -49407,28 +49101,18 @@ uEa iwa rhq czZ -mIH +tOk xUj -wHn -lZw -fCl +xUj +nIh +sQR xlH -mPV -tJL -ggs -utM -wWq -mkJ -xqe -umW -dPl -cOW -vFG -umW -dPl -cOW -vFG -umW +hCb +ahK +wkw +liw +hCb +ahK dPl cOW vFG @@ -49437,6 +49121,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -49601,28 +49295,18 @@ eEI pXI dKF vvf -mIH -uxC +bGf +edz tHt nIh sQR xlH -qCU -pBA -mkJ -qVB hCb -iyF -qqu -umW -dPl -cOW -vFG -umW -dPl -cOW -vFG -umW +ahK +wkw +liw +hCb +ahK cde cOW vFG @@ -49631,6 +49315,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -49795,28 +49489,18 @@ dKY paJ hBz xNR -mIH +gWm edz bRc -ifA -sbV +nIh +sQR xlH -cdP -tnU +hCb +ahK wkw -uMv -tXi -iyF -wxD -umW -dPl -cOW -vFG -umW -dPl -cOW -vFG -umW +liw +hCb +ahK dPl cOW vFG @@ -49825,6 +49509,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -49985,32 +49679,22 @@ myQ cPh myQ myQ -mIH +gLH eKd -mIH -mIH -mIH -xlH +dKF +dKF +dKF +xUj ogj +nIh +smw xlH -xlH -xlH -owH -wpx -mkJ -mkJ -mkJ -mkJ -ijr -umW -cde -cOW -vFG -umW -dPl -cOW -vFG -umW +hCb +ahK +wkw +liw +hCb +ahK dPl cOW vFG @@ -50019,6 +49703,16 @@ dPl cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -50178,33 +49872,23 @@ rlo jyW aHW cVq -fnf -cqT -aHW +dTo +mEN +gTg rWk kqm -jkF -jkF +niA +qVB tKs dpN -bCg qGM -oQS +qGM +sPQ +sPQ +sPQ +sPQ +sPQ sPQ -uob -sfT -slX -hYS -tfX -gcA -hRd -hRd -hRd -hRd -hRd -hRd -hRd -hRd hRd hRd hRd @@ -50213,6 +49897,16 @@ hRd hRd idY jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -50371,34 +50065,24 @@ qHl uWd sbr uWd -tOk -dTo -qHl uWd -sbr -ttX +dTo +dnX +rdy vYQ -fip -sbr -uWd +vYQ +vYQ +vYQ +vYQ +xxI dlY lCa -bbg -xxI -mkJ -mkJ -mkJ +hCb +ahK mkJ -xqe -umW -kky -cOW -vFG -umW -bpU -cOW -vFG -umW +liw +hCb +ahK bpU cOW vFG @@ -50407,6 +50091,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -50567,32 +50261,22 @@ fii buV buV buV -hTy -hTy -dXb -hTy -tmo -tmo -sGD -tmo -tmo +kGR +lYh +duV +rxU +mGW +xlY +iWG +laX +qQr tmo -ajP -aAZ -mkJ -ebc -luI +hCb +ahK mkJ -vFG -umW -kky -cOW -vFG -umW -bpU -cOW -vFG -umW +liw +hCb +ahK bpU cOW vFG @@ -50601,6 +50285,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -50764,29 +50458,19 @@ buV jSj lYh dAo -veG -tmo -afH -viX -jXq -hau +wOo +xHo +xlY +iWG +laX +gwR tmo -ydZ -aAZ -szl -nHR -swq +hCb +ahK mkJ -vFG -umW -bpU -cOW -vFG -umW -bpU -cOW -vFG -umW +liw +hCb +ahK kky cOW vFG @@ -50795,6 +50479,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -50955,32 +50649,22 @@ xcM eAg jBy buV -nvw -riA -fQi -hVr -tmo -gdV +wOo +lYh +duV +wOo +rbk +xlY tJR -wcN -pnJ +laX +gwR tmo -nHR -aAZ -mkJ -nHR -jGV +hCb +ahK mkJ -iAM -umW -bpU -cOW -vFG -umW -bpU -cOW -vFG -umW +liw +hCb +ahK bpU cOW vFG @@ -50989,6 +50673,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -51149,32 +50843,22 @@ rsc tbe jiL buV -eBc +hTy riA -fQi +duV wOo -tmo +lJy xlY -qQj -nhk -mlr +iWG +laX +gwR tmo -mps -oUt -mkJ -nHR -nHR +hCb +ahK mkJ -vFG -umW -bpU -cOW -vFG -umW -bpU -cOW -vFG -umW +liw +hCb +ahK bpU cOW vFG @@ -51183,6 +50867,16 @@ bpU cOW lKK xqe +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -51344,31 +51038,21 @@ uMr nxS buV cig -wUh -gUi +lYh +duV rGC +bIN +xlY +iWG +laX +gwR tmo -mDW -feT -qIv -hdy -tmo -hGR -aAZ -mkJ -thb -sap +hCb +ahK mkJ -vFG -umW -bpU -cOW -vFG -umW -bpU -cOW -vFG -umW +liw +hCb +ahK bpU cOW vFG @@ -51377,6 +51061,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -51538,31 +51232,21 @@ rhe kbQ buV fEO -qqM +lYh duV -hVr -tmo -wqn +duV +xlY +xlY iWG -eYj +laX gwR tmo -iKn -aAZ -mkJ -mkJ -mkJ +hCb +ahK mkJ -vFG -umW -bpU -cOW -vFG -umW -bpU -cOW -vFG -umW +liw +hCb +ahK bpU cOW vFG @@ -51571,6 +51255,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -51731,29 +51425,19 @@ buV mew buV buV -hTy -vOD -hTy -hTy -tmo -tmo -tmo +wOo +lYh +pEA +lnq +iWG +rRg +iWG laX +gwR tmo -tmo -nHR -aAZ -iyF -vFG -vFG -omy -vFG -umW -bpU -cOW -vFG -umW -bpU +hCb +ahK +mkJ cOW vFG umW @@ -51765,6 +51449,16 @@ kky cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -51900,15 +51594,15 @@ ojF hWi gcB wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc ojF hWi @@ -51925,29 +51619,19 @@ mKY czq llL buV -nlt -rjp +wOo +lYh mlW lnq -tmo +iWG rRg -erc -cXe -dUT +iWG +laX +gwR tmo -nHR -aAZ -rIH -vFG -vFG -omy -vFG -umW -bpU -cOW -vFG -umW -bpU +hCb +ahK +mkJ cOW vFG umW @@ -51959,6 +51643,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -52094,15 +51788,15 @@ vLy qLm pze wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc vLy qLm @@ -52120,28 +51814,18 @@ uvk rdZ buV vnb -woa +lYh pEA -sQF -tmo -olR -wzk -bIN +lnq +iWG +rRg +iWG +laX qQr tmo -mDw -aAZ -iyF -vFG -vFG -omy -vFG -umW -kky -cOW -vFG -umW -kky +hCb +ahK +wPf cOW vFG umW @@ -52153,6 +51837,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -52288,15 +51982,15 @@ tfe qLm gPI wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc tfe qLm @@ -52313,29 +52007,19 @@ buV buV buV buV -hTy -hTy -hTy -hTy -tmo -tmo -tmo -tmo -tmo +wOo +lYh +mlW +bvq +mlr +rRg +iWG +laX +gwR tmo -nHR -aAZ -rIH -jkE -jkE -omy -vFG -umW -bpU -cOW -vFG -umW -bpU +hCb +ahK +mkJ cOW vFG umW @@ -52347,6 +52031,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -52482,15 +52176,15 @@ gHW mNQ wLS wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc gHW mNQ @@ -52502,34 +52196,24 @@ ufr pmz pmz pmz -bGf -ajP -nHR -nHR -hGR -nHR -nHR -nHR -nHR -sGV +drw +drw nHR nHR nHR -bLz -nHR nHR aAZ iyF -vFG -vFG -omy -vFG -umW -bpU -cOW -vFG -umW -bpU +hCb +hCb +aVl +hCb +ahK +mkJ +liw +hCb +ahK +mkJ cOW vFG umW @@ -52541,6 +52225,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -52694,36 +52388,26 @@ cEQ bxO riD jwX -jwX wuH -dSN -eln -rWH -rWH -pXB -rWH -kaY -rWH -rWH -dSN -aVl -dSN -dSN -dSN +wuH +jXq +jXq +fnf +mDW dSN dSN jFR rIH -vFG -vFG -omy -vFG -umW -bpU -cOW -vFG -umW -bpU +hCb +hCb +aVl +hCb +ahK +mkJ +liw +hCb +ahK +mkJ cOW vFG umW @@ -52735,6 +52419,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -52888,36 +52582,26 @@ hta jBJ nCm kqd -pLv -hGe -fyF -gEC -rIH -rIH -rIH -rIH -rIH -rIH -rIH -rIH -rIH -rIH -rIH -rIH +hta +hta +bpN +bpN +tsP +mps rIH rIH rIH rIH -vFG -vFG -omy -vFG -umW -bpU -cOW -vFG -umW -bpU +hCb +hCb +aVl +hCb +ahK +mkJ +liw +hCb +ahK +mkJ cOW vFG umW @@ -52929,6 +52613,16 @@ bpU cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -53084,21 +52778,11 @@ vLd aMU aMU aMU +pZd mps -awR -rIH -lCA -lCA -lCA -lCA -lCA -lCA -lCA -xHT -lCA -lCA +mps +giq wjc -gkv wjc wjc wjc @@ -53123,6 +52807,16 @@ kky cOW vFG jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc jkE jkE vFG @@ -53276,23 +52970,13 @@ vEz rJX rBW iYZ -lNi aMU -nHR -gFf -rIH -vFG -vFG -vFG -vFG -vFG -jkE -vFG -vFG -vFG -vFG -vFG -jkE +plg +nWy +wUh +tnU +giq +wjc vFG vFG vFG @@ -53317,6 +53001,16 @@ jkE jkE jkE jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG jkE vFG @@ -53466,27 +53160,17 @@ bgq kFA atx aMU -msg -msg +gav +quT cSP -aSr -duB +msg aMU -hGR -gFf -rIH -vFG -vFG -jkE -omy -omy -omy -omy -omy -omy -jkE -omy -omy +gZK +wvw +lKT +tTL +giq +wjc omy omy omy @@ -53511,6 +53195,16 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG jkE vFG @@ -53645,42 +53339,32 @@ wjc vLy kFA daA -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +giq +giq +giq +giq +giq +giq +giq +giq +giq +giq +giq vLy kFA daA -wjc -wjc +giq +dsd quT -izW +cSP sRB -pPr aMU -aII -gFf -iyF -vFG -vFG -jkE -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +pJR +jEE +hau +llc +giq +wjc vFG vFG vFG @@ -53705,6 +53389,16 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG jkE vFG @@ -53839,41 +53533,31 @@ wjc lgz xdn aBF -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +giq +tFp +xiX +bXx +lNi +giq +shl +qWI +nYY +lNi +giq lgz xdn aBF -wjc -wjc +giq +fwO fZl aCs -msg -aRE +pIG aMU -nHR -gFf -rIH -iAM -vFG -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +aRE +qOX +eSr +kaY +giq vFG vFG vFG @@ -53899,6 +53583,16 @@ jkE jkE jkE jkE +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc jkE jkE jkE @@ -54033,41 +53727,31 @@ wjc bVn kFA bst -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +giq +sat +pin +rtd +gZF +giq +xjf +pin +rtd +gZF +giq bVn kFA bst -wjc -wjc -aMU -aMU -aMU -aMU +giq +wxD +cXe +gXy +msg aMU +msg aII -gFf -iyF -vFG -vFG -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +xnG +mJk +giq vFG vFG vFG @@ -54093,6 +53777,16 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG xJN @@ -54227,138 +53921,32 @@ wjc bgq kFA pze -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +giq +kKj +umL +rwE +jaJ +giq +kKj +umL +rwE +jaJ +giq bgq kFA pze -wjc -wjc -nHR -gWm -rWH -rWH -rWH -rWH -jFR -rIH -jkE +giq +giq +pbp +mps +mps +mps +mps +mps +pbp +mps +giq jkE -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -"} -(143,1,1) = {" -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG vFG vFG vFG @@ -54393,94 +53981,6 @@ wjc wjc wjc wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -lkX -mSf -gcB -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -lkX -mSf -gcB -wjc -wjc -nHR -gFf -hGR -nHR -cEl -hGR -oVt -rIH -vFG -vFG -omy -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG vFG vFG vFG @@ -54523,7 +54023,7 @@ vFG vFG vFG "} -(144,1,1) = {" +(143,1,1) = {" vFG vFG vFG @@ -54612,34 +54112,34 @@ wjc wjc wjc wjc -bgq -kFA -pze -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -bgq -kFA -pze -wjc -wjc -nHR -gFf -rIH -rIH -rIH -rIH -rIH -rIH -vFG +lkX +mSf +gcB +giq +uFv +moT +wuV +vUy +giq +xQE +moT +wuV +sap +giq +lkX +mSf +gcB +giq +uII +wLw +bUJ +lAc +mps +vOD +kAr +oVt +lAc +giq vFG omy vFG @@ -54717,7 +54217,7 @@ vFG vFG vFG "} -(145,1,1) = {" +(144,1,1) = {" vFG vFG vFG @@ -54808,34 +54308,34 @@ wjc wjc bgq kFA -kgv -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc +pze +giq +giq +nPz +giq +giq +giq +giq +uXZ +giq +giq +giq bgq kFA -kgv -wjc -wjc -nkn -gFf -rIH -vFG -vFG -vFG -jkE -vFG -vFG +pze +giq +nHw +oHn +fTV +fBq +mps +tzE +sbV +woa +fBq +giq vFG -jkE +omy vFG vFG vFG @@ -54911,7 +54411,7 @@ vFG vFG vFG "} -(146,1,1) = {" +(145,1,1) = {" vFG vFG vFG @@ -55000,11 +54500,37 @@ wjc wjc wjc wjc -tSW -dms -muD +bgq +kFA +kgv wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml wjc +bgq +kFA +kgv +giq +giq +mps +mps +mps +giq +giq +giq +giq +giq +giq +vFG +jkE +vFG wjc wjc wjc @@ -55014,34 +54540,8 @@ wjc wjc wjc wjc -tSW -dms -muD wjc wjc -nHR -gFf -iyF -vFG -vFG -vFG -jkE -vFG -vFG -vFG -jkE -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG vFG vFG vFG @@ -55105,7 +54605,7 @@ vFG vFG vFG "} -(147,1,1) = {" +(146,1,1) = {" vFG vFG vFG @@ -55194,9 +54694,37 @@ wjc wjc wjc wjc -txF -dZW -bic +tSW +dms +muD +wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml +wjc +tSW +dms +muD +wjc +wjc +nHR +gFf +iyF +vFG +vFG +vFG +jkE +vFG +vFG +vFG +jkE +vFG wjc wjc wjc @@ -55208,14 +54736,8 @@ wjc wjc wjc wjc -txF -dZW -bic vFG vFG -rWH -jFR -rIH vFG vFG vFG @@ -55240,6 +54762,178 @@ vFG vFG vFG vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +"} +(147,1,1) = {" +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +bgq +jWc +pze +wjc +xml +xml +xml +xml +xml +xml +xml +xml +xml +wjc +bgq +jWc +pze +vFG +vFG +rWH +jFR +rIH +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +vFG +vFG +vFG +vFG vFG vFG vFG @@ -55388,9 +55082,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc wjc @@ -55402,9 +55096,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze vFG vFG cEl @@ -55419,17 +55113,17 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -55582,9 +55276,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc wjc @@ -55596,9 +55290,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze vFG vFG rIH @@ -55611,19 +55305,19 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +vFG +vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -55776,9 +55470,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc wjc @@ -55790,9 +55484,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc lCA @@ -55807,17 +55501,17 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -xJN -vFG -vFG -vFG +wjc +wjc +wjc +vEb +kwx +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -55970,9 +55664,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc wjc @@ -55984,9 +55678,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc lCA @@ -56001,17 +55695,17 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -56164,9 +55858,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc wjc @@ -56178,9 +55872,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc lCA @@ -56195,17 +55889,17 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -56358,9 +56052,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc wjc @@ -56372,9 +56066,9 @@ wjc wjc wjc wjc -txF -dZW -bic +bgq +jWc +pze wjc wjc lCA @@ -56389,17 +56083,17 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -56552,23 +56246,23 @@ wjc wjc wjc wjc -txF -dZW -bic -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -wjc -txF -dZW -bic +bgq +jWc +pze +xml +xml +xml +xml +xml +xml +xml +xml +xml +xml +xml +bgq +jWc +pze wjc wjc lCA @@ -56583,17 +56277,17 @@ vFG vFG vFG vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG -vFG +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc +wjc vFG vFG vFG @@ -56746,23 +56440,23 @@ wjc wjc wjc wjc +bgq +jWc +pze txF -dZW -bic -txF -dZW -bic -bic -bic -txF -dZW -bic -txF -dZW -bic -txF -dZW +oUt +oUt +oUt +oUt +oUt +oUt +oUt +oUt +oUt bic +bgq +jWc +pze rIH lCA lCA @@ -56940,23 +56634,23 @@ wjc wjc wjc wjc -txF -dZW -txF -dZW -bic -txF -dZW -bic -txF -dZW -bic -txF -dZW -bic -txF +bgq +jWc +pze dZW +oUt +oUt +oUt +oUt +oUt +oUt +oUt +oUt +oUt bic +bgq +jWc +pze rIH lCA lCA