diff --git a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm index 7388740a69b..18005f47824 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm @@ -12,6 +12,7 @@ /obj/item/clothing/gloves/black, /obj/item/gun/energy/frontier/locked/holdout, /obj/item/radio/headset/explorer, + /obj/item/clothing/accessory/armor/helmetcamera/exploration/body, /obj/item/flashlight, /obj/item/gps/explorer, /obj/item/storage/box/flare, @@ -41,6 +42,7 @@ /obj/item/storage/backpack/dufflebag/emt, /obj/item/storage/box/autoinjectors, /obj/item/storage/box/syringes, + /obj/item/clothing/accessory/armor/helmetcamera/exploration/body, /obj/item/reagent_containers/glass/bottle/inaprovaline, /obj/item/reagent_containers/glass/bottle/antitoxin, /obj/item/storage/belt/medical/emt, @@ -84,6 +86,8 @@ /obj/item/storage/box/survival_knife, /obj/item/gun/energy/frontier/locked/holdout, /obj/item/clothing/head/pilot, + /obj/item/clothing/accessory/armor/helmetcamera/exploration, + /obj/item/clothing/accessory/armor/helmetcamera/exploration/body, /obj/item/clothing/under/rank/pilot1, /obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/shoes/boots/winter/explorer, @@ -124,6 +128,8 @@ /obj/item/clothing/gloves/black, /obj/item/radio/headset/pathfinder, /obj/item/radio/headset/pathfinder/alt, + /obj/item/clothing/accessory/armor/helmetcamera/exploration, + /obj/item/clothing/accessory/armor/helmetcamera/exploration/body, /obj/item/flashlight, /obj/item/gps/explorer, /obj/item/storage/belt/explorer, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 89f7c4a3ef9..674f9ece542 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -106,6 +106,7 @@ /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/suit/storage/toggle/labcoat/emt, /obj/item/radio/headset/headset_med/alt, + /obj/item/clothing/accessory/armor/helmetcamera/body, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para, /obj/item/cartridge/medical, /obj/item/storage/briefcase/inflatable, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index c002146877f..8461b12977a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -171,6 +171,8 @@ /obj/item/storage/belt/security, /obj/item/radio/headset/heads/hos, /obj/item/radio/headset/heads/hos/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/shield/riot/tele, /obj/item/storage/box/holobadge/hos, /obj/item/clothing/accessory/badge/holo/hos, @@ -198,6 +200,8 @@ /obj/item/disk/nifsoft/blueshield, /obj/item/radio/headset/heads/blueshield, /obj/item/radio/headset/heads/blueshield/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/clothing/glasses/sunglasses/medhud, /obj/item/clothing/head/beret/sec/corporate/blueshield, /obj/item/clothing/under/oricon/utility/sysguard/crew/blueshield, @@ -247,6 +251,8 @@ /obj/item/cartridge/security, /obj/item/radio/headset/headset_sec, /obj/item/radio/headset/headset_sec/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/barrier_tape_roll/police, /obj/item/clothing/accessory/badge/holo/warden, @@ -287,6 +293,8 @@ /obj/item/cartridge/security, /obj/item/radio/headset/headset_sec, /obj/item/radio/headset/headset_sec/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/storage/belt/security, /obj/item/flash, /obj/item/reagent_containers/spray/pepper, @@ -359,6 +367,7 @@ /obj/item/storage/box/evidence, /obj/item/radio/headset/headset_sec, /obj/item/radio/headset/headset_sec/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/clothing/suit/storage/vest/, /obj/item/clothing/suit/storage/vest/detective, /obj/item/barrier_tape_roll/police, @@ -438,6 +447,8 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br /obj/item/cartridge/security, /obj/item/radio/headset/headset_sec, /obj/item/radio/headset/headset_sec/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/storage/belt/security, /obj/item/flash, /obj/item/reagent_containers/spray/pepper, @@ -484,6 +495,8 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br /obj/item/cartridge/hos, /obj/item/radio/headset/heads/hos, /obj/item/radio/headset/heads/hos/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/barrier_tape_roll/police, /obj/item/shield/riot, @@ -531,6 +544,8 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br /obj/item/cartridge/security, /obj/item/radio/headset/headset_sec, /obj/item/radio/headset/headset_sec/alt, + /obj/item/clothing/accessory/armor/helmetcamera/security, + /obj/item/clothing/accessory/armor/helmetcamera/security/body, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/barrier_tape_roll/police, /obj/item/clothing/accessory/badge/holo/warden, diff --git a/code/modules/jobs/job_types/station/exploration/field_medic.dm b/code/modules/jobs/job_types/station/exploration/field_medic.dm index 40a6ff249cf..901474a35fc 100644 --- a/code/modules/jobs/job_types/station/exploration/field_medic.dm +++ b/code/modules/jobs/job_types/station/exploration/field_medic.dm @@ -24,6 +24,7 @@ ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_GENERAL_PILOT, + ACCESS_GENERAL_EXPLORER, ) outfit_type = /datum/outfit/job/station/sar desc = "A Field medic works as the field doctor of expedition teams." diff --git a/code/modules/modular_computers/file_system/programs/generic/camera.dm b/code/modules/modular_computers/file_system/programs/generic/camera.dm index 53caa5a38d1..d2ec76dcf4f 100644 --- a/code/modules/modular_computers/file_system/programs/generic/camera.dm +++ b/code/modules/modular_computers/file_system/programs/generic/camera.dm @@ -79,4 +79,4 @@ size = 8 available_on_ntnet = 1 requires_ntnet = 1 - required_access = ACCESS_GENERAL_EXPLORER + required_access = ACCESS_GENERAL_PILOT diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm index c1e1eab0ca8..9cd0d53d68b 100644 --- a/maps/rift/levels/rift-02-underground2.dmm +++ b/maps/rift/levels/rift-02-underground2.dmm @@ -144,6 +144,9 @@ /area/engineering/engine_core) "aw" = ( /obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating/lythios43c{ outdoors = 0 }, @@ -2183,10 +2186,10 @@ /area/rnd/secure_storage/critical) "gS" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/supermatter_engine, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/computer/skills, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "gT" = ( @@ -3765,9 +3768,6 @@ /obj/machinery/camera/network/engineering{ dir = 4 }, -/obj/machinery/computer/card{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "lE" = ( @@ -7807,9 +7807,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) -"yT" = ( -/turf/simulated/floor/sky/depths/lythios43c, -/area/rift/surfacebase/underground/under2) "yU" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7835,14 +7832,14 @@ "yZ" = ( /obj/machinery/button/remote/driver{ id = "enginecore"; - name = "Emergency Core Eject"; + name = "Second Stage Engine Ejection - Core Ejection"; pixel_y = -21 }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for the engine core's emergency ejection vent."; dir = 1; id = "EngineVent"; - name = "Emergency Engine Ejection Vent"; + name = "First Stage Engine Ejection - Blast Doors"; pixel_y = -32 }, /obj/structure/window/basic{ @@ -10955,9 +10952,6 @@ "Le" = ( /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/lower) -"Lg" = ( -/turf/simulated/floor/sky/depths/lythios43c, -/area/rift/surfacebase/underground/under2) "Li" = ( /obj/structure/cable/cyan{ icon_state = "1-4" @@ -11556,6 +11550,10 @@ /obj/machinery/requests_console/preset/ce{ pixel_y = -30 }, +/obj/machinery/mass_driver{ + dir = 8; + id = "enginecore" + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "Nm" = ( @@ -13428,16 +13426,15 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "TY" = ( -/obj/machinery/computer/skills{ - dir = 4 - }, -/obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 }, /obj/machinery/light_switch{ pixel_x = -21 }, +/obj/machinery/computer/card{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "TZ" = ( @@ -14982,192 +14979,192 @@ (1,1,1) = {" AW -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -yT -Lg +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA +WA aa aa aa diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 441fbf41646..0359f3104c7 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -304,9 +304,6 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -1924,6 +1921,9 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) "bpJ" = ( @@ -5466,16 +5466,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) -"dFk" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/outpost/xenobiology/outpost_hallway) "dFu" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -5668,13 +5658,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/xenobiology/xenoflora) -"dJS" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/railing, -/turf/simulated/floor/lythios43c, -/area/rift/surfacebase/outside/outside1) "dLp" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, @@ -6665,6 +6648,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) "elP" = ( @@ -10639,8 +10625,7 @@ /area/maintenance/lowmedbaymaint) "gXI" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/central_heating/surface_one) @@ -11385,9 +11370,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"hqG" = ( -/turf/simulated/floor/tiled/steel_grid/lythios43c, -/area/rift/surfacebase/outside/outside1) "hqO" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -12659,9 +12641,6 @@ }, /turf/simulated/floor/wood, /area/maintenance/starboard) -"ieX" = ( -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/outside1) "ieZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -17175,9 +17154,6 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/sign/department/cargo{ pixel_y = 32 }, @@ -17523,9 +17499,6 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside1) -"lcN" = ( -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/outside1) "lde" = ( /obj/structure/railing{ dir = 4 @@ -18890,8 +18863,8 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "mbT" = ( -/obj/machinery/vending/cigarette{ - dir = 1 +/obj/machinery/vending/cola{ + dir = 4 }, /turf/simulated/floor/tiled/steel_ridged, /area/hallway/secondary/civilian_hallway_mid) @@ -24096,15 +24069,6 @@ /obj/structure/catwalk, /turf/simulated/floor/lythios43c, /area/rift/surfacebase/outside/outside1) -"oZW" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel_grid/lythios43c, -/area/rift/surfacebase/outside/outside1) "pan" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/toolbox/mechanical{ @@ -27196,10 +27160,43 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/flora/pottedplant/sticky{ - pixel_y = 8 - }, /obj/structure/table/reinforced, +/obj/item/clothing/accessory/armor/helmetcamera/body{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/body{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/body{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/body{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/body{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/body{ + pixel_x = -4 + }, +/obj/item/clothing/accessory/armor/helmetcamera{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera{ + pixel_x = 4 + }, /turf/simulated/floor/tiled/steel, /area/storage/tools) "qVS" = ( @@ -29435,6 +29432,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) "smQ" = ( @@ -31946,10 +31946,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/evahallway) -"tJx" = ( -/obj/structure/railing, -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/outside1) "tJC" = ( /obj/random/maintenance/clean, /turf/simulated/floor/plating, @@ -35234,7 +35230,7 @@ /area/quartermaster/foyer) "vOp" = ( /obj/machinery/vending/coffee{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled/steel_ridged, /area/hallway/secondary/civilian_hallway_mid) @@ -36577,6 +36573,9 @@ /obj/machinery/computer/supplycomp{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) "wBV" = ( @@ -39403,13 +39402,14 @@ nNX nNX nNX wCM -oZW -hqG +pqd +ubp iFU nNX nNX wCM -dJS +nog +nNX nNX nNX nNX @@ -39488,1556 +39488,1555 @@ nNX nNX nNX nNX -ieX xXX "} (2,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +wCM pqd ubp vwm -lcN -lcN -tJx +nNX +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX xXX "} (3,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +wCM pqd ubp vwm -lcN -lcN -tJx +nNX +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX xXX "} (4,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX okO pqd ubp vwm vFs -lcN -tJx +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX xXX "} (5,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +wCM pqd ubp vwm -lcN -lcN -tJx +nNX +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX xXX "} (6,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +wCM pqd ubp vwm -lcN -lcN -tJx +nNX +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX xXX "} (7,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +wCM pqd ubp vwm -lcN -lcN -tJx +nNX +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX xXX "} (8,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX ovz gXe pqd ubp vwm vUA -lcN -tJx +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX xXX "} (9,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX ovz okO pqd ubp vwm vFs -lcN -tJx +nNX +wCM nog -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41045,108 +41044,108 @@ dGy "} (10,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX huw vUA pqd @@ -41157,76 +41156,76 @@ mfX vUA nkZ vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41239,108 +41238,108 @@ dGy "} (11,1,1) = {" xXX -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX huw sGn pqd @@ -41353,68 +41352,68 @@ vUA vUA iFN iFN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41433,91 +41432,91 @@ dGy "} (12,1,1) = {" dGy -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41526,15 +41525,15 @@ iFN mfX mfX fdY -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX fRj oFG pqd @@ -41551,58 +41550,58 @@ iFN iFN iFN iFN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41642,73 +41641,73 @@ iFN iFN iFN iFN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA vUA vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41720,15 +41719,15 @@ iFN iFN iFN jZZ -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx iFN pqd @@ -41752,45 +41751,45 @@ iFN plm plm plm -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41852,54 +41851,54 @@ iFN vUA vUA vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA vUA vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA vUA vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -41914,15 +41913,15 @@ oFG iFN iFN fKY -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX btn vNx pqd @@ -41948,37 +41947,37 @@ iFN iFN opC plm -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -42047,49 +42046,49 @@ vUA vUA vUA iFN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA vUA vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA vUA vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -42109,15 +42108,15 @@ iFN qiK iFN fdY -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX jhV pqd ubp @@ -42251,27 +42250,27 @@ iFN vUA vUA vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vUA vUA vUA @@ -42303,15 +42302,15 @@ oFG oFG oFG tzy -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -42497,15 +42496,15 @@ roQ spS tmv tzy -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -42691,15 +42690,15 @@ rUp syC tmv tzy -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -42885,15 +42884,15 @@ rUp syC tmv tzy -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -43079,15 +43078,15 @@ rXL syC tmv tzy -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -43104,10 +43103,10 @@ hgE iFN iFN xwv -lcN +nNX vgp -lcN -lcN +nNX +nNX iFN iFN iFN @@ -43273,15 +43272,15 @@ sph sEO tmv sjR -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX jhV pqd ubp @@ -43297,15 +43296,15 @@ hgE iFN iFN xwv -lcN -lcN +nNX +nNX vgp -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -43466,16 +43465,16 @@ oFG oFG oFG tzy -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -43490,16 +43489,16 @@ hgE iFN iFN jZZ -lcN -lcN +nNX +nNX vUA pRO vUA -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -43660,16 +43659,16 @@ iFN iFN oFG jZZ -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -43684,44 +43683,44 @@ iFN iFN iFN jZZ -lcN -lcN +nNX +nNX vUA pRO vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -43854,15 +43853,15 @@ iFN iFN iFN jZZ -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX rNK iFN pqd @@ -43878,45 +43877,45 @@ iFN iFN iFN jZZ -lcN -lcN +nNX +nNX vUA pRO vUA -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -44048,15 +44047,15 @@ iFN iFN iFN jZZ -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx iFN pqd @@ -44072,47 +44071,47 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -44242,15 +44241,15 @@ oFG oFG iFN jZZ -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx iFN pqd @@ -44267,48 +44266,48 @@ iFN iFN iFN fdY -lcN -lcN +nNX +nNX vgp -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -44436,15 +44435,15 @@ iFN oFG iFN jZZ -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX aLC vFs pqd @@ -44461,49 +44460,49 @@ iFN iFN iFN jZZ -lcN -lcN +nNX +nNX vgp -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -44631,15 +44630,15 @@ oFG iFN iFN fdY -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx pqd ubp @@ -44655,17 +44654,17 @@ iFN iFN iFN jZZ -lcN -lcN +nNX +nNX vgp -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX plm plm plm @@ -44690,14 +44689,14 @@ plm plm plm plm -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -44826,12 +44825,12 @@ iFN iFN iFN fdY -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX gxt mfX iFN @@ -44849,17 +44848,17 @@ iFN iFN iFN jZZ -lcN -lcN +nNX +nNX vgp -lcN -lcN -lcN -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +nNX +nNX +nNX +wCM sHD sHD sHD @@ -44885,13 +44884,13 @@ sHD bSW sHD ivW -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -45043,17 +45042,17 @@ iFN iFN iFN xoc -lcN -lcN +nNX +nNX vgp qqW qqW qqW qqW -lcN -lcN -lcN -tJx +nNX +nNX +nNX +wCM sGn sGn ykF @@ -45079,13 +45078,13 @@ dTo dTo sHD ivW -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -45236,9 +45235,9 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp qqW fhp @@ -45273,13 +45272,13 @@ wnN dTo sHD ivW -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -45430,9 +45429,9 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp qqW kMx @@ -45467,13 +45466,13 @@ xjQ jzo sHD ivW -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -45624,9 +45623,9 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd jOr @@ -45661,14 +45660,14 @@ mPx dTo sGn iEK -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -45818,9 +45817,9 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd jOr @@ -45857,12 +45856,12 @@ sGn sGn iEK plm -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -46012,9 +46011,9 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd jOr @@ -46052,11 +46051,11 @@ sGn mLf cNa ohQ -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -46207,8 +46206,8 @@ iFd iFd iFd klr -lcN -lcN +nNX +nNX vgp qqW wjW @@ -46246,10 +46245,10 @@ slF slF slF slF -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX klr iFd iFd @@ -46983,8 +46982,8 @@ iFd iFd iFd klr -lcN -lcN +nNX +nNX vgp qqW mSy @@ -47022,10 +47021,10 @@ slF slF slF slF -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX klr iFd iFd @@ -47176,14 +47175,14 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd mDM pPk -dFk +haT cya cya cya @@ -47214,13 +47213,13 @@ wQR xIm sGn sGn -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -47370,9 +47369,9 @@ iFN iFN iFN jZZ -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd rZO @@ -47410,10 +47409,10 @@ sHD lcM btn btn -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX iFN iFN iFN @@ -47564,9 +47563,9 @@ iFN iFN iFN xoc -lcN -lcN -lcN +nNX +nNX +nNX vgp qqW wqA @@ -47601,13 +47600,13 @@ pOV wQR sGn tCw -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -47758,18 +47757,18 @@ iFN iFN jZZ mix -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd wqA lTj mBd -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX fxg sHD xEp @@ -47796,12 +47795,12 @@ wQR sHD sHD ivW -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -47952,19 +47951,19 @@ iFN iFN jZZ mix -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd wqA lTj mBd -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +wCM sHD atq nzP @@ -47990,12 +47989,12 @@ wQR sHD oEo ivW -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN hgE @@ -48154,11 +48153,11 @@ qqW mSy klC qqW -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +wCM sHD jPz vAc @@ -48184,12 +48183,12 @@ wQR sHD okG ivW -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -48348,11 +48347,11 @@ xmK wqA lTj mBd -lcN -lcN -lcN -lcN -tJx +nNX +nNX +nNX +nNX +wCM sHD sHD sHD @@ -48377,12 +48376,12 @@ sHD swu sHD lcM -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -48542,11 +48541,11 @@ xmK wqA lTj mBd -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX btn btn btn @@ -48570,12 +48569,12 @@ btn btn btn btn -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -48736,40 +48735,40 @@ qqW wjj rqu qqW -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX iFN iFN iFN @@ -48922,47 +48921,47 @@ emM emM qqW arS -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd wqA lTj mBd -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx iFN iFN @@ -49116,47 +49115,47 @@ lib typ wes arS -lcN -lcN -lcN +nNX +nNX +nNX vgp mBd wqA lTj mBd -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX vNx iFN iFN @@ -49311,38 +49310,38 @@ yeX wes hgE hgE -lcN -lcN +nNX +nNX vgp qqW mSy lTj qqW -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX gxt mfX mfX @@ -49512,29 +49511,29 @@ mBd wqA lTj mBd -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr vUA klr -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX gxt mfX iFN @@ -49706,19 +49705,19 @@ mBd wqA lTj mBd -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX klr klr vUA @@ -49900,16 +49899,16 @@ qqW wqA rJy qqW -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN -lcN +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX +nNX gxt hgE mfX @@ -50094,8 +50093,8 @@ mBd dHX fam mBd -lcN -lcN +nNX +nNX gxt hgE mfX diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 066deecf1dd..c48753db0a8 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -952,6 +952,22 @@ /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled/monotile, /area/rnd/research) +"aGC" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/button/windowtint/multitint{ + id = "operating_theatre_1"; + pixel_x = -24; + pixel_y = -2 + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgery) "aHd" = ( /obj/structure/frame{ anchored = 1 @@ -2166,8 +2182,11 @@ /turf/simulated/floor/tiled/steel, /area/rnd/research) "bmS" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full{ + id = "operating_theatre_2"; + spawn_grille = 0 + }, /turf/simulated/floor/plating, /area/medical/surgery2) "bmY" = ( @@ -3442,7 +3461,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/medical{ +/obj/machinery/door/airlock/glass/medical/polarized{ id_tint = "medbay_outer"; name = "Medbay Lobby" }, @@ -5146,13 +5165,13 @@ /area/maintenance/research/rnd) "drO" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/medical{ - name = "Chemistry"; - req_one_access = list(33) - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/glass/medical{ + name = "Chemistry"; + req_one_access = list(33) + }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "dsc" = ( @@ -5627,13 +5646,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/security/hallway) "dCV" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre 2"; - req_access = list(45) - }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -5644,6 +5665,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass/medical/polarized{ + id_tint = "operating_theatre_2"; + name = "Operating Theatre 2"; + req_access = list(45) + }, +/obj/machinery/holosign/surgery{ + id = "operating_theatre_2" + }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "dDb" = ( @@ -5897,8 +5926,12 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/camera/network/security{ dir = 4 }, @@ -6539,6 +6572,11 @@ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/button/windowtint/multitint{ + id = "operating_theatre_1"; + pixel_x = -24; + pixel_y = 7 + }, /turf/simulated/floor/tiled/white, /area/medical/surgery) "ehg" = ( @@ -6635,7 +6673,7 @@ dir = 10 }, /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/multi_tile/medical{ +/obj/machinery/door/airlock/multi_tile/glass/medical{ id_tag = "medbay_lobby"; id_tint = "medbay_outer"; name = "Medbay Lobby"; @@ -9095,8 +9133,11 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "fSS" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full{ + id = "operating_theatre_1"; + spawn_grille = 0 + }, /turf/simulated/floor/plating, /area/medical/surgery) "fTu" = ( @@ -11190,8 +11231,10 @@ pixel_x = -32 }, /obj/structure/disposalpipe/segment, -/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "medbay outer" + }, /turf/simulated/floor/plating, /area/medical/reception) "hlW" = ( @@ -11219,6 +11262,12 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/security/hallway) "hnn" = ( @@ -11897,6 +11946,12 @@ /obj/structure/foamedmetal, /turf/simulated/floor/plating, /area/rift/surfacebase/outside/outside2) +"hJB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/evastorage) "hJF" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12108,6 +12163,11 @@ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/button/windowtint/multitint{ + id = "operating_theatre_2"; + pixel_x = -24; + pixel_y = 7 + }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "hNv" = ( @@ -12727,29 +12787,45 @@ }, /obj/item/clothing/accessory/armor/tag/ntbs{ pixel_x = 5; - pixel_y = 1 - }, -/obj/item/clothing/accessory/armor/tag/ntbs{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/clothing/accessory/armor/tag/ntbs{ - pixel_x = 5; - pixel_y = 1 + pixel_y = 6 }, /obj/item/clothing/accessory/armor/tag/ntc{ pixel_x = 5; - pixel_y = 5 - }, -/obj/item/clothing/accessory/armor/tag/ntc{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/clothing/accessory/armor/tag/ntc{ - pixel_x = 5; - pixel_y = 5 + pixel_y = 9 }, /obj/effect/floor_decal/corner/red/border, +/obj/item/clothing/accessory/armor/helmetcamera/security/body{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/helmetcamera/security/body{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/helmetcamera/security/body{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/helmetcamera/security/body{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/clothing/accessory/armor/helmetcamera/security{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/clothing/accessory/armor/helmetcamera/security{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/clothing/accessory/armor/helmetcamera/security{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/clothing/accessory/armor/helmetcamera/security{ + pixel_x = 4; + pixel_y = 2 + }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "ieu" = ( @@ -14145,6 +14221,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/security/evastorage) "jbT" = ( @@ -19636,6 +19718,26 @@ }, /turf/simulated/floor/plating, /area/security/interrogation) +"mqP" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/button/windowtint/multitint{ + id = "operating_theatre_2"; + pixel_x = -24; + pixel_y = -2 + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgery2) +"mre" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/security/evastorage) "mrE" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -19671,6 +19773,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/security/evastorage) "msb" = ( @@ -25003,6 +25111,10 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/lockers) +"pPl" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel, +/area/security/evastorage) "pPM" = ( /turf/simulated/floor/tiled, /area/security/briefing_room) @@ -25020,10 +25132,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/hammerhead/general) "pPZ" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre 1"; - req_access = list(45) - }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25034,6 +25142,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass/medical/polarized{ + id_tint = "operating_theatre_1"; + name = "Operating Theatre 1"; + req_access = list(45) + }, +/obj/machinery/holosign/surgery{ + id = "operating_theatre_1" + }, /turf/simulated/floor/tiled/white, /area/medical/surgery) "pQK" = ( @@ -26182,7 +26298,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light, /turf/simulated/floor/tiled/monotile, -/area/space) +/area/security/security_lockerroom) "qBo" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -29377,6 +29493,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/security/evastorage) "sEV" = ( @@ -32468,6 +32590,15 @@ }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) +"uPK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/security/evastorage) "uQA" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/cap/hidden, @@ -32520,6 +32651,12 @@ }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/heads/hor) +"uRz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/security/evastorage) "uRC" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -34122,8 +34259,10 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/locker) "vPP" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/babyblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "medbay outer" + }, /turf/simulated/floor/plating, /area/medical/reception) "vQg" = ( @@ -50004,13 +50143,13 @@ hga hga kIL rzB -sop +mqP xlp hNg iJA eut aAG -uFg +aGC guh ehd eXK @@ -56778,8 +56917,8 @@ lMt aZS eRj vqS -vqS -vqS +mre +uPK jbn dXY vek @@ -56973,7 +57112,7 @@ aZS ske ske ske -vqS +hJB jqL dXY tXm @@ -57167,7 +57306,7 @@ aZS nEx nCa nCa -vqS +hJB kKh dXY nYB @@ -57360,8 +57499,8 @@ lMt aZS eRj vqS -vqS -vqS +pPl +uRz lye dXY eIB diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index b7284889d5c..0742ee01ce4 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -314,6 +314,10 @@ dir = 5 }, /obj/structure/disposalpipe/trunk, +/obj/machinery/air_alarm{ + desc = " "; + pixel_y = 24 + }, /turf/simulated/floor/tiled/steel, /area/exploration/pathfinder_office) "abf" = ( @@ -1359,9 +1363,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) -"aen" = ( -/turf/simulated/open/lythios43c, -/area/rift/surfacebase/outside/outside3) "aep" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -11364,6 +11365,10 @@ /area/exploration) "aFL" = ( /obj/structure/reagent_dispensers/water_cooler/full, +/obj/machinery/air_alarm{ + desc = " "; + pixel_y = 24 + }, /turf/simulated/floor/wood, /area/exploration/meeting) "aFM" = ( @@ -12650,7 +12655,42 @@ /obj/item/binoculars{ pixel_y = 10 }, -/obj/item/ano_scanner, +/obj/item/ano_scanner{ + pixel_y = 18 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration/body{ + pixel_x = -6 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration/body{ + pixel_x = -6 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration/body{ + pixel_x = -6 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration/body{ + pixel_x = -6 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration/body{ + pixel_x = -6 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration/body{ + pixel_x = -6 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration{ + pixel_x = 4 + }, +/obj/item/clothing/accessory/armor/helmetcamera/exploration{ + pixel_x = 4 + }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "aJp" = ( @@ -23422,19 +23462,6 @@ "owP" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) -"oxo" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/door/blast/shutters{ - id = "kitchen_shutters"; - name = "Kitchen Shutters" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "oxz" = ( /obj/machinery/light, /obj/structure/cable/green{ @@ -27308,7 +27335,7 @@ aOi aOi aOi aOi -aen +aOi aOC "} (3,1,1) = {" @@ -38871,7 +38898,7 @@ amd wec aNU aMs -oxo +aUj aCk amJ aWd diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index 632d873d124..885319f623f 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -159,7 +159,9 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) "aJ" = ( -/obj/machinery/door/window/holowindoor, +/obj/machinery/door/window/holowindoor{ + dir = 4 + }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) "aK" = ( @@ -304,6 +306,7 @@ /area/holodeck/source_courtroom) "bf" = ( /obj/machinery/door/window/holowindoor{ + dir = 4; name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, @@ -764,6 +767,7 @@ "cB" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; + dir = 4; icon_state = "right" }, /turf/simulated/floor/holofloor/tiled, @@ -783,6 +787,7 @@ "cE" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; + dir = 4; icon_state = "right"; name = "Green Team" }, @@ -1251,6 +1256,7 @@ /area/holodeck/source_meetinghall) "eg" = ( /obj/machinery/door/window/holowindoor{ + dir = 4; name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, @@ -1266,6 +1272,7 @@ /area/holodeck/source_beach) "ej" = ( /obj/machinery/door/window/holowindoor{ + dir = 4; name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, @@ -1873,6 +1880,7 @@ "fX" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; + dir = 4; icon_state = "right"; name = "Green Team" }, @@ -1892,6 +1900,7 @@ "ga" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; + dir = 4; icon_state = "right"; name = "Green Team" }, diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm index 8637b2b4446..e48f0e6335e 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm @@ -95,9 +95,9 @@ /area/tether_away/beach/resort) "as" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -109,8 +109,8 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/flashlight/pen, /obj/item/paper{ - name = "Doctor's Note"; - info = "The cold packs have run out, and after I rationed them so carefully. HQ says it will be another month before we can get new ones. Until then the best thing we can do for the heatstroke casulties is to drag them down to the saltwater and dunk them hope it cools them enough to stop them from dying. What sort of operation do the Hadiis think they are running. Miners need to be in good health to be productive and they can't be in good health if they are constantly at risk for or recovering from heatstroke. There has to be another way to source coldpacks otherwise I fear I may start losing people." + info = "The cold packs have run out, and after I rationed them so carefully. HQ says it will be another month before we can get new ones. Until then the best thing we can do for the heatstroke casulties is to drag them down to the saltwater and dunk them hope it cools them enough to stop them from dying. What sort of operation do the Hadiis think they are running. Miners need to be in good health to be productive and they can't be in good health if they are constantly at risk for or recovering from heatstroke. There has to be another way to source coldpacks otherwise I fear I may start losing people."; + name = "Doctor's Note" }, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/resort/lockermed) @@ -156,9 +156,9 @@ /area/tether_away/beach/resort/canteen) "aE" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /obj/machinery/seed_extractor, /turf/simulated/floor/tiled/asteroid_steel, @@ -357,9 +357,6 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/jungle) -"bi" = ( -/turf/unsimulated/mineral/outdoors, -/area/tether_away/beach/water) "bj" = ( /turf/simulated/floor/water, /area/tether_away/beach/jungle) @@ -754,13 +751,13 @@ /area/tether_away/beach/station/tram) "eH" = ( /obj/machinery/atmospherics/pipe/tank{ - dir = 1; desc = "A large vessel for containing brine, a by product of water desalination. It hasn't been used in a while."; + dir = 1; name = "Brine Tank" }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -815,8 +812,8 @@ dir = 4 }, /obj/item/paper/crumpled{ - name = "discarded note"; - info = "Remember my offer, any water you can sneak out is good but I don't think the desalinator plant will care if a high capacity container or two goes missing. You may think this is risky but the Hadiis are going to work us to death out here. You know that I know that, the Hadiis know that to. Water stores mean we may be able to last longer, hell if we had a constantly supply we'd e self suffcient. We could last a long time without them even here. Just think about it, I know you believe in the revolution even if the Hadiis don't." + info = "Remember my offer, any water you can sneak out is good but I don't think the desalinator plant will care if a high capacity container or two goes missing. You may think this is risky but the Hadiis are going to work us to death out here. You know that I know that, the Hadiis know that to. Water stores mean we may be able to last longer, hell if we had a constantly supply we'd e self suffcient. We could last a long time without them even here. Just think about it, I know you believe in the revolution even if the Hadiis don't."; + name = "discarded note" }, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/desalinator) @@ -827,9 +824,9 @@ /area/tether_away/beach/station) "fm" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 10 + dir = 10; + name = "water pipe" }, /obj/machinery/vending/hydronutrients{ req_one_access = list(30,35,47,77) @@ -1279,9 +1276,9 @@ /area/tether_away/beach/bunker/mess) "iO" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/glass/bucket, @@ -1903,9 +1900,9 @@ }, /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -2166,9 +2163,9 @@ /area/tether_away/beach/station/terminal) "qZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 6 + dir = 6; + name = "water pipe" }, /turf/simulated/floor/water/deep, /area/tether_away/beach/desalinator) @@ -2218,12 +2215,12 @@ "ry" = ( /obj/machinery/atmospherics/pipe/tank/oxygen{ desc = "A large tank designed to aid in the desalination of water. It hasn't been used in a while."; - name = "Desalination Tank"; - dir = 1 + dir = 1; + name = "Desalination Tank" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -2691,9 +2688,9 @@ /area/tether_away/beach/bunker/engi) "vg" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 1 + dir = 1; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -2845,9 +2842,9 @@ /area/tether_away/beach/bunker/engi) "wv" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel{ outdoors = 1 @@ -2878,9 +2875,9 @@ /area/tether_away/beach/bunker/mess) "wI" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /obj/machinery/seed_storage/garden, /turf/simulated/floor/tiled/asteroid_steel, @@ -2942,8 +2939,8 @@ /area/tether_away/beach/resort/fishing) "xe" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/water/deep, /area/tether_away/beach/desalinator) @@ -3073,9 +3070,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel{ outdoors = 1 @@ -3098,9 +3095,9 @@ "yI" = ( /obj/structure/reagent_dispensers/coolanttank, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 10 + dir = 10; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -3155,8 +3152,8 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -3241,8 +3238,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -3388,13 +3385,13 @@ "Cj" = ( /obj/machinery/atmospherics/pipe/tank/oxygen{ desc = "A large tank designed to aid in the desalination of water. It hasn't been used in a while."; - name = "Desalination Tank"; - dir = 1 + dir = 1; + name = "Desalination Tank" }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -3444,8 +3441,8 @@ /area/tether_away/beach/coast) "CG" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -3453,9 +3450,9 @@ /obj/machinery/light/small, /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -3486,8 +3483,8 @@ /area/tether_away/beach/station) "CS" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -3683,9 +3680,9 @@ /obj/item/material/knife, /obj/item/material/knife, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /obj/machinery/reagentgrinder, /turf/simulated/floor/tiled/asteroid_steel, @@ -3698,8 +3695,8 @@ "EG" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/item/paper{ - name = "taped note"; - info = "You owe me big for this... I almost got caught down at the desalination plant over this shit" + info = "You owe me big for this... I almost got caught down at the desalination plant over this shit"; + name = "taped note" }, /turf/simulated/mineral/floor/cave{ name = "dirt" @@ -3719,9 +3716,9 @@ /area/tether_away/beach/bunker/bunk) "EM" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 8 + dir = 8; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -3874,14 +3871,14 @@ /area/tether_away/beach/bunker/restroom) "GE" = ( /obj/machinery/atmospherics/pipe/tank{ - dir = 1; desc = "A large vessel for containing brine, a by product of water desalination. It hasn't been used in a while."; + dir = 1; name = "Brine Tank" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 5 + dir = 5; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -4016,9 +4013,9 @@ /area/tether_away/beach/aa) "HN" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 10 + dir = 10; + name = "water pipe" }, /turf/simulated/floor/water/deep, /area/tether_away/beach/desalinator) @@ -4261,9 +4258,9 @@ /obj/item/material/knife/machete/hatchet, /obj/item/material/knife/machete/hatchet, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 6 + dir = 6; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -4283,9 +4280,9 @@ "Kq" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -4504,9 +4501,6 @@ /obj/item/storage/box/glasses/rocks, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/mess) -"MA" = ( -/turf/unsimulated/mineral/outdoors, -/area/tether_away/beach/jungle) "ME" = ( /obj/structure/cable{ icon_state = "1-8" @@ -4534,17 +4528,17 @@ /area/tether_away/beach/station) "MN" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/water/deep, /area/tether_away/beach/desalinator) "MX" = ( /obj/structure/reagent_dispensers/coolanttank, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 6 + dir = 6; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -4739,8 +4733,8 @@ /area/tether_away/beach/resort) "OL" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -4895,8 +4889,8 @@ /obj/random/firstaid, /obj/structure/table/rack/shelf/steel, /obj/item/paper/crumpled{ - name = "Dirty Note"; - info = "Damnit S'irtan can you do anything right. All you had to was protect the stash and make sure so animals got to it. Not at least before we could move it. You not only failed that but spent so much time drinking the spiders are nesting right on our shit. This has set us back months. May Messa take the Revisionists I am done. If they want to get eaten trying to snatch from the giant spiders they are welcome too. I am not becoming an arachnid's meal." + info = "Damnit S'irtan can you do anything right. All you had to was protect the stash and make sure so animals got to it. Not at least before we could move it. You not only failed that but spent so much time drinking the spiders are nesting right on our shit. This has set us back months. May Messa take the Revisionists I am done. If they want to get eaten trying to snatch from the giant spiders they are welcome too. I am not becoming an arachnid's meal."; + name = "Dirty Note" }, /turf/simulated/mineral/floor/cave{ name = "dirt" @@ -5356,9 +5350,9 @@ "UC" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 5 + dir = 5; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -5577,9 +5571,9 @@ /area/tether_away/beach/resort/lockermed) "WX" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 8 + dir = 8; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -5622,9 +5616,9 @@ "XB" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 9 + dir = 9; + name = "water pipe" }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) @@ -5704,9 +5698,9 @@ /area/tether_away/beach/bunker) "YD" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 4 + dir = 4; + name = "water pipe" }, /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled/asteroid_steel, @@ -5851,13 +5845,13 @@ "ZQ" = ( /obj/structure/reagent_dispensers/coolanttank, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - name = "water pipe"; - desc = "Its bone dry." + desc = "Its bone dry."; + name = "water pipe" }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - name = "water pipe"; desc = "Its bone dry."; - dir = 2 + dir = 2; + name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) @@ -6007,71 +6001,71 @@ Cg Cg Cg Cg -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg "} (2,1,1) = {" zV @@ -6265,7 +6259,7 @@ am am am HW -bi +Cg "} (3,1,1) = {" zV @@ -6459,7 +6453,7 @@ am am am am -bi +Cg "} (4,1,1) = {" zV @@ -6653,7 +6647,7 @@ am am am am -bi +Cg "} (5,1,1) = {" zV @@ -6847,7 +6841,7 @@ am am am am -bi +Cg "} (6,1,1) = {" zV @@ -7041,7 +7035,7 @@ am am am am -bi +Cg "} (7,1,1) = {" zV @@ -7235,7 +7229,7 @@ am am am am -bi +Cg "} (8,1,1) = {" zV @@ -7429,7 +7423,7 @@ am am am am -bi +Cg "} (9,1,1) = {" zV @@ -7623,7 +7617,7 @@ am am am am -bi +Cg "} (10,1,1) = {" zV @@ -7817,7 +7811,7 @@ am am am am -bi +Cg "} (11,1,1) = {" zV @@ -8011,7 +8005,7 @@ am am am am -bi +Cg "} (12,1,1) = {" an @@ -8205,7 +8199,7 @@ am am am am -bi +Cg "} (13,1,1) = {" an @@ -8399,7 +8393,7 @@ am am am am -bi +Cg "} (14,1,1) = {" an @@ -8593,7 +8587,7 @@ am am am am -bi +Cg "} (15,1,1) = {" an @@ -8787,7 +8781,7 @@ am am am am -bi +Cg "} (16,1,1) = {" an @@ -8981,7 +8975,7 @@ am am am am -bi +Cg "} (17,1,1) = {" zV @@ -9175,7 +9169,7 @@ am am am am -bi +Cg "} (18,1,1) = {" zV @@ -9369,7 +9363,7 @@ am am am am -bi +Cg "} (19,1,1) = {" zV @@ -9563,7 +9557,7 @@ am am am am -bi +Cg "} (20,1,1) = {" zV @@ -9757,7 +9751,7 @@ am am am am -bi +Cg "} (21,1,1) = {" zV @@ -9951,7 +9945,7 @@ am am am am -bi +Cg "} (22,1,1) = {" zV @@ -10145,7 +10139,7 @@ am am am am -bi +Cg "} (23,1,1) = {" zV @@ -10339,7 +10333,7 @@ am am am am -bi +Cg "} (24,1,1) = {" zV @@ -10366,18 +10360,18 @@ ZC ZC ZC bq -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK ZC ZC ZC @@ -10533,7 +10527,7 @@ am am am am -bi +Cg "} (25,1,1) = {" zV @@ -10571,14 +10565,14 @@ bq bq bq bq -MA -MA -MA -MA -MA -MA -MA -MA +TK +TK +TK +TK +TK +TK +TK +TK ZC ZC ZC @@ -10727,10 +10721,10 @@ am am am am -bi +Cg "} (26,1,1) = {" -MA +TK bq bq bq @@ -10772,8 +10766,8 @@ bq bq bq bq -MA -MA +TK +TK zV zV zV @@ -10921,10 +10915,10 @@ am am am am -bi +Cg "} (27,1,1) = {" -MA +TK bq bq bq @@ -11115,10 +11109,10 @@ am am am am -bi +Cg "} (28,1,1) = {" -MA +TK bq bq bq @@ -11309,10 +11303,10 @@ am am am am -bi +Cg "} (29,1,1) = {" -MA +TK bq bq bq @@ -11503,10 +11497,10 @@ am am am am -bi +Cg "} (30,1,1) = {" -MA +TK bq bq bq @@ -11697,10 +11691,10 @@ am am am am -bi +Cg "} (31,1,1) = {" -MA +TK bq bq bq @@ -11891,10 +11885,10 @@ am am am am -bi +Cg "} (32,1,1) = {" -MA +TK bq bq bq @@ -12085,10 +12079,10 @@ am am am am -bi +Cg "} (33,1,1) = {" -MA +TK bq bq bq @@ -12279,10 +12273,10 @@ am am am am -bi +Cg "} (34,1,1) = {" -MA +TK bq bq bq @@ -12473,10 +12467,10 @@ am am am am -bi +Cg "} (35,1,1) = {" -MA +TK bq bq bq @@ -12667,10 +12661,10 @@ am am am am -bi +Cg "} (36,1,1) = {" -MA +TK bq bq bq @@ -12861,10 +12855,10 @@ am am am am -bi +Cg "} (37,1,1) = {" -MA +TK bq bq bq @@ -13055,10 +13049,10 @@ am am am am -bi +Cg "} (38,1,1) = {" -MA +TK bq bq bq @@ -13249,10 +13243,10 @@ am am am am -bi +Cg "} (39,1,1) = {" -MA +TK bq bq bq @@ -13443,10 +13437,10 @@ am am am am -bi +Cg "} (40,1,1) = {" -MA +TK bq bq bq @@ -13459,8 +13453,8 @@ ce ce ce ce -ce -ce +bp +bp ce ce bp @@ -13637,10 +13631,10 @@ am am am am -bi +Cg "} (41,1,1) = {" -MA +TK bq bq bq @@ -13831,10 +13825,10 @@ am am am am -bi +Cg "} (42,1,1) = {" -MA +TK bq bq bq @@ -14025,10 +14019,10 @@ am am am am -bi +Cg "} (43,1,1) = {" -MA +TK bq bq bq @@ -14042,7 +14036,7 @@ bq bp ce ce -ce +bp bp bp bp @@ -14219,10 +14213,10 @@ am am am am -bi +Cg "} (44,1,1) = {" -MA +TK bq bq bq @@ -14413,10 +14407,10 @@ am am am am -bi +Cg "} (45,1,1) = {" -MA +TK bq bq bq @@ -14432,7 +14426,7 @@ bp bp bp bp -aa +bp aa ce ce @@ -14607,10 +14601,10 @@ am am am am -bi +Cg "} (46,1,1) = {" -MA +TK bq bq bq @@ -14622,11 +14616,11 @@ ce ce ce aa +bp +bp aa aa -aa -aa -aa +bp aa aa aa @@ -14801,10 +14795,10 @@ am am am am -bi +Cg "} (47,1,1) = {" -MA +TK bq bq bq @@ -14819,7 +14813,7 @@ aa aa aa aa -aa +bp aa aa aa @@ -14995,10 +14989,10 @@ am am am am -bi +Cg "} (48,1,1) = {" -MA +TK bq bq bq @@ -15011,7 +15005,7 @@ ce aa aa aa -aa +bp aa aa aa @@ -15189,10 +15183,10 @@ am am am am -bi +Cg "} (49,1,1) = {" -MA +TK bq bq bq @@ -15206,7 +15200,7 @@ aa aa aa aa -aa +bp aa aa aa @@ -15383,10 +15377,10 @@ am am am am -bi +Cg "} (50,1,1) = {" -MA +TK bq bq bq @@ -15400,7 +15394,7 @@ aa aa aa aa -aa +bp aa aa aa @@ -15577,10 +15571,10 @@ am am am am -bi +Cg "} (51,1,1) = {" -MA +TK bq bq bq @@ -15595,7 +15589,7 @@ aa aa aa aa -aa +bp aa aa aa @@ -15771,10 +15765,10 @@ am am am am -bi +Cg "} (52,1,1) = {" -MA +TK bq bq bq @@ -15788,8 +15782,8 @@ aa aa aa aa -aa -aa +bp +bp aa aa aa @@ -15965,10 +15959,10 @@ am am am am -bi +Cg "} (53,1,1) = {" -MA +TK bq bq bq @@ -15981,9 +15975,9 @@ aa aa aa aa +bp aa -aa -aa +bp aa aa aa @@ -16159,10 +16153,10 @@ am am am am -bi +Cg "} (54,1,1) = {" -MA +TK bq bq bq @@ -16353,10 +16347,10 @@ am am am am -bi +Cg "} (55,1,1) = {" -MA +TK bq bq bq @@ -16371,7 +16365,7 @@ aa aa aa aa -aa +bp aa aa aa @@ -16547,10 +16541,10 @@ am am am am -bi +Cg "} (56,1,1) = {" -MA +TK bq bq bq @@ -16563,10 +16557,10 @@ aa aa aa aa +bp aa aa -aa -aa +bp aa aa ab @@ -16741,10 +16735,10 @@ am am am am -bi +Cg "} (57,1,1) = {" -MA +TK bq bq bq @@ -16935,10 +16929,10 @@ am am am am -bi +Cg "} (58,1,1) = {" -MA +TK bq bq bq @@ -16948,13 +16942,13 @@ ce aa aa aa -ce +aa aa ab aa +bp aa -aa -aa +bp aa aa aa @@ -17129,15 +17123,16 @@ am am am am -bi +Cg "} (59,1,1) = {" -MA +TK bq bq bq ce ce +ce aa aa aa @@ -17145,8 +17140,7 @@ aa aa aa aa -aa -aa +bp aa aa aa @@ -17323,10 +17317,10 @@ am am am am -bi +Cg "} (60,1,1) = {" -MA +TK bq bq bq @@ -17339,7 +17333,7 @@ aa ab aa aa -aa +bp aa aa aa @@ -17517,10 +17511,10 @@ am am am am -bi +Cg "} (61,1,1) = {" -MA +TK bq bq bq @@ -17533,9 +17527,9 @@ aa aa aa aa -ce aa aa +bp aa aa aa @@ -17711,10 +17705,10 @@ am am am am -bi +Cg "} (62,1,1) = {" -MA +TK bq bq bq @@ -17722,14 +17716,14 @@ bq ce aa aa -ce -ce aa aa aa aa aa +bp aa +bp aa aa aa @@ -17905,10 +17899,10 @@ am am am am -bi +Cg "} (63,1,1) = {" -MA +TK bq bq bq @@ -17917,7 +17911,7 @@ ce aa aa aa -ce +aa aa aa bh @@ -18099,10 +18093,10 @@ am am am am -bi +Cg "} (64,1,1) = {" -MA +TK bq bq bq @@ -18116,8 +18110,8 @@ aa aa ab aa +bp aa -ce aa aa aa @@ -18293,17 +18287,14 @@ am am am am -bi +Cg "} (65,1,1) = {" -MA -MA +TK +bq bq bq ce -aa -ce -ce ce aa aa @@ -18313,6 +18304,9 @@ aa aa aa aa +bp +aa +aa aa aa aa @@ -18487,18 +18481,12 @@ am am am am -bi +Cg "} (66,1,1) = {" TK -ce -ce -ce -aa -ce -ce -ce -ce +bq +bq ce ce aa @@ -18513,6 +18501,12 @@ aa aa aa aa +bp +aa +aa +aa +aa +aa aa aa aa @@ -18681,21 +18675,21 @@ am am am am -bi +Cg "} (67,1,1) = {" TK -ce -ce -ce +bq +bq ce aa -ce -ce -ce -ce -ce -ce +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -18875,26 +18869,26 @@ am am am am -bi +Cg "} (68,1,1) = {" TK +bq +bq ce -ce -ce +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa bp bp -ce -ce -aa -aa -aa -ce -aa -aa -aa -aa -aa aa aa aa @@ -19069,27 +19063,27 @@ am am am am -bi +Cg "} (69,1,1) = {" TK +bq +bq ce +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa bp -ce -ce -bp -bp -aa -ce -ce -aa -aa -aa -aa -ce -aa -aa -aa aa aa bp @@ -19263,28 +19257,28 @@ am am am am -bi +Cg "} (70,1,1) = {" TK -ce -bp -bp -ce -ce -aa -aa -aa +bq +bq ce aa aa aa aa aa -ce +aa +aa +aa +aa aa aa bp +aa +aa +aa bp aa aa @@ -19457,19 +19451,19 @@ am am am am -bi +Cg "} (71,1,1) = {" TK +bq +bq +ce +ce +aa +aa +aa aa -ce -ce -ce -ce -ce -bp aa -bp aa aa ab @@ -19477,13 +19471,13 @@ aa aa aa aa +bp +aa +bp aa aa aa -aa -aa -aa -aa +bp aa aa aa @@ -19651,17 +19645,14 @@ am am am am -bi +Cg "} (72,1,1) = {" TK +bq +bq ce ce -ce -ce -ce -ce -aa aa aa aa @@ -19675,8 +19666,11 @@ bp aa aa aa +bp aa aa +bp +aa aa aa aa @@ -19845,32 +19839,32 @@ am am am am -bi +Cg "} (73,1,1) = {" -MA -MA +TK +bq bq bq ce ce -ce +aa +aa +aa +aa +aa +aa aa aa aa bp bp aa -aa -aa -aa bp aa aa aa -aa -aa -aa +bp aa aa aa @@ -20039,10 +20033,10 @@ am am am am -bi +Cg "} (74,1,1) = {" -MA +TK bq bq bq @@ -20053,18 +20047,18 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa bp bp bp aa bp -aa -aa -aa -aa -aa -aa -aa +bp aa aa aa @@ -20233,21 +20227,16 @@ am am am am -bi +Cg "} (75,1,1) = {" -MA +TK bq bq bq bq ce aa -ce -aa -aa -aa -aa aa aa aa @@ -20257,9 +20246,14 @@ aa aa aa aa +bp +aa +bp aa aa +bp aa +bp aa aa aa @@ -20427,10 +20421,10 @@ am am am am -bi +Cg "} (76,1,1) = {" -MA +TK bq bq bq @@ -20444,12 +20438,12 @@ aa aa aa aa +aa +aa +aa +aa +aa bp -bp -aa -aa -aa -aa aa aa aa @@ -20621,25 +20615,25 @@ am am am am -bi +Cg "} (77,1,1) = {" -MA +TK bq bq bq bq ce +ce +aa aa aa aa aa aa aa -ce aa aa -bp aa aa aa @@ -20815,18 +20809,15 @@ am am am am -bi +Cg "} (78,1,1) = {" -MA +TK bq bq bq bq ce -aa -aa -aa ce aa aa @@ -20836,6 +20827,9 @@ aa aa aa aa +aa +aa +aa bp aa aa @@ -21009,16 +21003,16 @@ am am am am -bi +Cg "} (79,1,1) = {" -MA +TK bq bq bq bq ce -aa +ce ce aa aa @@ -21203,17 +21197,17 @@ am am am am -bi +Cg "} (80,1,1) = {" -MA +TK bq bq bq bq ce -aa -aa +ce +ce aa aa aa @@ -21397,18 +21391,18 @@ am am am am -bi +Cg "} (81,1,1) = {" -MA +TK +bq bq bq bq bq ce ce -aa -aa +ce aa aa aa @@ -21591,10 +21585,11 @@ am am am am -bi +Cg "} (82,1,1) = {" -MA +TK +bq bq bq bq @@ -21669,7 +21664,6 @@ aa aa aa aa -aa lI lI lI @@ -21785,10 +21779,11 @@ am am am am -bi +Cg "} (83,1,1) = {" -MA +TK +bq bq bq bq @@ -21802,7 +21797,6 @@ aa aa aa aa -ce aa aa aa @@ -21979,10 +21973,10 @@ am am am am -bi +Cg "} (84,1,1) = {" -MA +TK bq bq bq @@ -21991,12 +21985,12 @@ bq bq ce ce +ce +aa +aa aa aa -ce -ce aa -ce aa aa aa @@ -22173,10 +22167,10 @@ am am am am -bi +Cg "} (85,1,1) = {" -MA +TK bq bq bq @@ -22185,10 +22179,10 @@ bq bq bq ce -aa -aa -aa ce +ce +aa +aa aa aa aa @@ -22367,10 +22361,10 @@ am am am am -bi +Cg "} (86,1,1) = {" -MA +TK bq bq bq @@ -22380,8 +22374,8 @@ bq bq ce ce -aa -aa +ce +ce aa aa aa @@ -22561,10 +22555,10 @@ am am am am -bi +Cg "} (87,1,1) = {" -MA +TK bq bq bq @@ -22575,8 +22569,8 @@ bq bq ce ce -aa -aa +ce +ce aa aa aa @@ -22755,10 +22749,10 @@ am am am am -bi +Cg "} (88,1,1) = {" -MA +TK bq bq bq @@ -22770,8 +22764,8 @@ bq bq ce ce -aa -aa +ce +ce aa aa aa @@ -22949,10 +22943,10 @@ am am am am -bi +Cg "} (89,1,1) = {" -MA +TK bq bq bq @@ -23143,10 +23137,10 @@ am am am am -bi +Cg "} (90,1,1) = {" -MA +TK bq bq bq @@ -23337,10 +23331,10 @@ am am am am -bi +Cg "} (91,1,1) = {" -MA +TK bq bq bq @@ -23531,10 +23525,10 @@ am am am am -bi +Cg "} (92,1,1) = {" -MA +TK bq bq bq @@ -23725,10 +23719,10 @@ am am am am -bi +Cg "} (93,1,1) = {" -MA +TK bq bq bq @@ -23919,10 +23913,10 @@ am am am am -bi +Cg "} (94,1,1) = {" -MA +TK bq bq bq @@ -24113,10 +24107,10 @@ am am am am -bi +Cg "} (95,1,1) = {" -MA +TK bq bq bq @@ -24307,10 +24301,10 @@ am am am am -bi +Cg "} (96,1,1) = {" -MA +TK bq bq bq @@ -24501,10 +24495,10 @@ am am am am -bi +Cg "} (97,1,1) = {" -MA +TK bq bq bq @@ -24695,10 +24689,10 @@ am am am am -bi +Cg "} (98,1,1) = {" -MA +TK bq bq bq @@ -24889,10 +24883,10 @@ am am am am -bi +Cg "} (99,1,1) = {" -MA +TK bq bq bq @@ -25083,10 +25077,10 @@ am am am am -bi +Cg "} (100,1,1) = {" -MA +TK bq bq bq @@ -25277,10 +25271,10 @@ am am am am -bi +Cg "} (101,1,1) = {" -MA +TK bq bq br @@ -25471,11 +25465,11 @@ am am am am -bi +Cg "} (102,1,1) = {" -MA -MA +TK +TK br br br @@ -25665,7 +25659,7 @@ am am am am -bi +Cg "} (103,1,1) = {" bo @@ -25859,7 +25853,7 @@ am am am am -bi +Cg "} (104,1,1) = {" bo @@ -26053,7 +26047,7 @@ am am am am -bi +Cg "} (105,1,1) = {" bo @@ -26247,7 +26241,7 @@ am am am am -bi +Cg "} (106,1,1) = {" bo @@ -26441,7 +26435,7 @@ am am am am -bi +Cg "} (107,1,1) = {" bo @@ -26635,7 +26629,7 @@ am am am am -bi +Cg "} (108,1,1) = {" bo @@ -26829,11 +26823,11 @@ am am am am -bi +Cg "} (109,1,1) = {" -MA -MA +TK +TK br br br @@ -27023,10 +27017,10 @@ am am am am -bi +Cg "} (110,1,1) = {" -MA +TK bq br br @@ -27217,10 +27211,10 @@ am am am am -bi +Cg "} (111,1,1) = {" -MA +TK bq bq br @@ -27411,10 +27405,10 @@ am am am am -bi +Cg "} (112,1,1) = {" -MA +TK bq bq bq @@ -27605,10 +27599,10 @@ am am am am -bi +Cg "} (113,1,1) = {" -MA +TK bq bq bq @@ -27799,10 +27793,10 @@ am am am am -bi +Cg "} (114,1,1) = {" -MA +TK bq bq bq @@ -27993,10 +27987,10 @@ am am am am -bi +Cg "} (115,1,1) = {" -MA +TK bq bq bq @@ -28187,10 +28181,10 @@ am am am am -bi +Cg "} (116,1,1) = {" -MA +TK bq bq bq @@ -28381,10 +28375,10 @@ am am am am -bi +Cg "} (117,1,1) = {" -MA +TK bq bq bq @@ -28575,10 +28569,10 @@ am am am am -bi +Cg "} (118,1,1) = {" -MA +TK bq bq bq @@ -28769,10 +28763,10 @@ am am am am -bi +Cg "} (119,1,1) = {" -MA +TK bq bq bq @@ -28963,10 +28957,10 @@ am am am am -bi +Cg "} (120,1,1) = {" -MA +TK bq bq bq @@ -29157,10 +29151,10 @@ am am am am -bi +Cg "} (121,1,1) = {" -MA +TK bq bq bq @@ -29351,10 +29345,10 @@ am am am am -bi +Cg "} (122,1,1) = {" -MA +TK bq bq bq @@ -29545,10 +29539,10 @@ am am am am -bi +Cg "} (123,1,1) = {" -MA +TK bq bq bq @@ -29739,10 +29733,10 @@ am am am am -bi +Cg "} (124,1,1) = {" -MA +TK bq bq bq @@ -29933,10 +29927,10 @@ am am am am -bi +Cg "} (125,1,1) = {" -MA +TK bq bq bq @@ -30127,10 +30121,10 @@ am am am am -bi +Cg "} (126,1,1) = {" -MA +TK bq bq bq @@ -30321,10 +30315,10 @@ am am am am -bi +Cg "} (127,1,1) = {" -MA +TK bq bq bq @@ -30515,10 +30509,10 @@ am am am am -bi +Cg "} (128,1,1) = {" -MA +TK bq bq bq @@ -30709,10 +30703,10 @@ am am am am -bi +Cg "} (129,1,1) = {" -MA +TK bq bq bq @@ -30903,10 +30897,10 @@ am am am am -bi +Cg "} (130,1,1) = {" -MA +TK bq bq bq @@ -31097,10 +31091,10 @@ am am am am -bi +Cg "} (131,1,1) = {" -MA +TK bq bq bq @@ -31291,10 +31285,10 @@ am am am am -bi +Cg "} (132,1,1) = {" -MA +TK bq bq bq @@ -31485,10 +31479,10 @@ am am am am -bi +Cg "} (133,1,1) = {" -MA +TK bq bq bq @@ -31679,10 +31673,10 @@ am am am am -bi +Cg "} (134,1,1) = {" -MA +TK bq bq bq @@ -31873,10 +31867,10 @@ am am am am -bi +Cg "} (135,1,1) = {" -MA +TK bq bq bq @@ -32067,10 +32061,10 @@ am am am am -bi +Cg "} (136,1,1) = {" -MA +TK bq bq bq @@ -32261,10 +32255,10 @@ am am am am -bi +Cg "} (137,1,1) = {" -MA +TK bq bq bq @@ -32455,10 +32449,10 @@ am am am am -bi +Cg "} (138,1,1) = {" -MA +TK bq bq bq @@ -32649,10 +32643,10 @@ am am am am -bi +Cg "} (139,1,1) = {" -MA +TK bq bq bq @@ -32843,10 +32837,10 @@ am am am am -bi +Cg "} (140,1,1) = {" -MA +TK bq bq bq @@ -33037,10 +33031,10 @@ am am am am -bi +Cg "} (141,1,1) = {" -MA +TK bq bq bq @@ -33231,10 +33225,10 @@ am am am am -bi +Cg "} (142,1,1) = {" -MA +TK bq bq bq @@ -33425,10 +33419,10 @@ am am am am -bi +Cg "} (143,1,1) = {" -MA +TK bq bq bq @@ -33619,10 +33613,10 @@ am am am am -bi +Cg "} (144,1,1) = {" -MA +TK bq bq bq @@ -33813,10 +33807,10 @@ am am am am -bi +Cg "} (145,1,1) = {" -MA +TK bq bq bq @@ -34007,10 +34001,10 @@ am am am am -bi +Cg "} (146,1,1) = {" -MA +TK bq bq bq @@ -34201,10 +34195,10 @@ am am am am -bi +Cg "} (147,1,1) = {" -MA +TK bq bq bq @@ -34395,10 +34389,10 @@ am am am am -bi +Cg "} (148,1,1) = {" -MA +TK bq bq bq @@ -34589,10 +34583,10 @@ am am am am -bi +Cg "} (149,1,1) = {" -MA +TK bq bq bq @@ -34783,10 +34777,10 @@ am am am am -bi +Cg "} (150,1,1) = {" -MA +TK bq bq bq @@ -34977,10 +34971,10 @@ am am am am -bi +Cg "} (151,1,1) = {" -MA +TK bq bq bq @@ -35171,10 +35165,10 @@ am am am am -bi +Cg "} (152,1,1) = {" -MA +TK bq bq bq @@ -35365,10 +35359,10 @@ am am am am -bi +Cg "} (153,1,1) = {" -MA +TK bq bq bq @@ -35559,10 +35553,10 @@ am am am am -bi +Cg "} (154,1,1) = {" -MA +TK bq bq bq @@ -35753,10 +35747,10 @@ am am am am -bi +Cg "} (155,1,1) = {" -MA +TK bq bq bq @@ -35947,10 +35941,10 @@ am am am am -bi +Cg "} (156,1,1) = {" -MA +TK bq bq bq @@ -36141,10 +36135,10 @@ am am am am -bi +Cg "} (157,1,1) = {" -MA +TK bq bq bq @@ -36335,10 +36329,10 @@ am am am am -bi +Cg "} (158,1,1) = {" -MA +TK bq bq bq @@ -36529,10 +36523,10 @@ am am am am -bi +Cg "} (159,1,1) = {" -MA +TK bq bq bq @@ -36723,10 +36717,10 @@ am am am am -bi +Cg "} (160,1,1) = {" -MA +TK bq bq bq @@ -36917,10 +36911,10 @@ am am am am -bi +Cg "} (161,1,1) = {" -MA +TK bq bq bq @@ -37111,10 +37105,10 @@ am am am am -bi +Cg "} (162,1,1) = {" -MA +TK bq bq bq @@ -37305,10 +37299,10 @@ am am am am -bi +Cg "} (163,1,1) = {" -MA +TK bq bq bq @@ -37499,10 +37493,10 @@ am am am am -bi +Cg "} (164,1,1) = {" -MA +TK bq bq bq @@ -37693,10 +37687,10 @@ am am am am -bi +Cg "} (165,1,1) = {" -MA +TK bq bq bq @@ -37887,10 +37881,10 @@ am am am am -bi +Cg "} (166,1,1) = {" -MA +TK bq bq bq @@ -38081,10 +38075,10 @@ am am am am -bi +Cg "} (167,1,1) = {" -MA +TK bq bq bq @@ -38275,10 +38269,10 @@ am am am am -bi +Cg "} (168,1,1) = {" -MA +TK bq bq bq @@ -38469,10 +38463,10 @@ am am am am -bi +Cg "} (169,1,1) = {" -MA +TK bq bq bq @@ -38663,10 +38657,10 @@ am am am am -bi +Cg "} (170,1,1) = {" -MA +TK bq bq bq @@ -38857,10 +38851,10 @@ am am am am -bi +Cg "} (171,1,1) = {" -MA +TK bq bq bq @@ -39051,10 +39045,10 @@ am am am am -bi +Cg "} (172,1,1) = {" -MA +TK bq bq bq @@ -39245,10 +39239,10 @@ am am am am -bi +Cg "} (173,1,1) = {" -MA +TK bq bq bq @@ -39439,10 +39433,10 @@ am am am am -bi +Cg "} (174,1,1) = {" -MA +TK bq bq bq @@ -39633,10 +39627,10 @@ am am am am -bi +Cg "} (175,1,1) = {" -MA +TK bq bq bq @@ -39827,10 +39821,10 @@ am am am am -bi +Cg "} (176,1,1) = {" -MA +TK bq bq bq @@ -40021,10 +40015,10 @@ am am am am -bi +Cg "} (177,1,1) = {" -MA +TK bq bq bq @@ -40215,10 +40209,10 @@ am am am am -bi +Cg "} (178,1,1) = {" -MA +TK bq bq bq @@ -40409,10 +40403,10 @@ am am am am -bi +Cg "} (179,1,1) = {" -MA +TK bq bq bq @@ -40603,10 +40597,10 @@ am am am am -bi +Cg "} (180,1,1) = {" -MA +TK bq bq bq @@ -40797,10 +40791,10 @@ am am am am -bi +Cg "} (181,1,1) = {" -MA +TK bq bq bq @@ -40991,10 +40985,10 @@ am am am am -bi +Cg "} (182,1,1) = {" -MA +TK bq bq bq @@ -41185,10 +41179,10 @@ am am am am -bi +Cg "} (183,1,1) = {" -MA +TK bq bq bq @@ -41379,10 +41373,10 @@ am am am am -bi +Cg "} (184,1,1) = {" -MA +TK bq bq bq @@ -41573,10 +41567,10 @@ am am am am -bi +Cg "} (185,1,1) = {" -MA +TK bq bq bq @@ -41767,10 +41761,10 @@ am am am am -bi +Cg "} (186,1,1) = {" -MA +TK bq bq bq @@ -41961,10 +41955,10 @@ am am am am -bi +Cg "} (187,1,1) = {" -MA +TK bq bq bq @@ -42155,10 +42149,10 @@ am am am am -bi +Cg "} (188,1,1) = {" -MA +TK bq bq bq @@ -42349,10 +42343,10 @@ am am am am -bi +Cg "} (189,1,1) = {" -MA +TK bq bq bq @@ -42543,10 +42537,10 @@ am am am am -bi +Cg "} (190,1,1) = {" -MA +TK bq bq bq @@ -42737,10 +42731,10 @@ am am am am -bi +Cg "} (191,1,1) = {" -MA +TK bq bq bq @@ -42931,119 +42925,119 @@ am am am am -bi +Cg "} (192,1,1) = {" -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA -MA +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK +TK Lj Lj Lj @@ -43062,68 +43056,68 @@ Cg Cg Cg Cg -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg "} diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_cave.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_cave.dmm index 63a95db8dd9..9ce210c932f 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_cave.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_cave.dmm @@ -15,9 +15,6 @@ /obj/away_mission_init/beachcave, /turf/simulated/mineral/cave, /area/tether_away/cave/explored/normal) -"j" = ( -/turf/unsimulated/mineral/outdoors, -/area/tether_away/cave/explored/normal) "r" = ( /obj/tether_away_spawner/beach_cave, /turf/simulated/mineral/floor/ignore_mapgen/cave, @@ -225,201 +222,201 @@ M "} (2,1,1) = {" M -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M I I I I I -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M I I I I I I -j -j -j -j -j -j -j -j -j +M +M +M +M +M +M +M +M +M M "} (3,1,1) = {" M -e +M e e e @@ -608,12 +605,12 @@ e e e e -j +M M "} (4,1,1) = {" M -e +M e e e @@ -802,12 +799,12 @@ e e e e -j +M M "} (5,1,1) = {" M -e +M e e e @@ -996,12 +993,12 @@ e e e e -j +M M "} (6,1,1) = {" M -j +M e e e @@ -1190,12 +1187,12 @@ c e e e -j +M M "} (7,1,1) = {" M -j +M e e e @@ -1384,12 +1381,12 @@ a e e e -j +M M "} (8,1,1) = {" M -j +M e e e @@ -1578,12 +1575,12 @@ a e e e -j +M M "} (9,1,1) = {" M -j +M e e e @@ -1772,12 +1769,12 @@ a I e e -j +M M "} (10,1,1) = {" M -j +M e e e @@ -1966,14 +1963,14 @@ a I I e -j +M M "} (11,1,1) = {" M -j +M +e e -j e c c @@ -2160,14 +2157,14 @@ a I I e -j +M M "} (12,1,1) = {" M -j +M +e e -j e c c @@ -2359,7 +2356,7 @@ d "} (13,1,1) = {" M -e +M e e e @@ -2553,7 +2550,7 @@ d "} (14,1,1) = {" M -j +M e e e @@ -2747,7 +2744,7 @@ d "} (15,1,1) = {" M -j +M e e e @@ -2941,7 +2938,7 @@ d "} (16,1,1) = {" M -j +M e e e @@ -3135,7 +3132,7 @@ d "} (17,1,1) = {" M -j +M e e e @@ -3324,12 +3321,12 @@ c e e e -j +M M "} (18,1,1) = {" M -j +M e e e @@ -3518,12 +3515,12 @@ c e e e -j +M M "} (19,1,1) = {" M -j +M e e e @@ -3712,12 +3709,12 @@ c e e e -j +M M "} (20,1,1) = {" M -j +M e e e @@ -3906,12 +3903,12 @@ c e e e -j +M M "} (21,1,1) = {" M -j +M e e e @@ -4100,12 +4097,12 @@ c e e e -j +M M "} (22,1,1) = {" M -j +M e e e @@ -4294,12 +4291,12 @@ c e e e -j +M M "} (23,1,1) = {" M -j +M e e e @@ -4488,12 +4485,12 @@ c e e e -j +M M "} (24,1,1) = {" M -j +M e e e @@ -4682,12 +4679,12 @@ c e e e -j +M M "} (25,1,1) = {" M -j +M e e e @@ -4876,12 +4873,12 @@ c e e e -j +M M "} (26,1,1) = {" M -j +M e e e @@ -5070,12 +5067,12 @@ c e e e -j +M M "} (27,1,1) = {" M -j +M e e e @@ -5264,12 +5261,12 @@ c e e e -j +M M "} (28,1,1) = {" M -j +M e e e @@ -5458,12 +5455,12 @@ c e e e -j +M M "} (29,1,1) = {" M -j +M e e e @@ -5652,12 +5649,12 @@ c e e e -j +M M "} (30,1,1) = {" M -j +M e e e @@ -5846,12 +5843,12 @@ c e e e -j +M M "} (31,1,1) = {" M -j +M e e e @@ -6040,12 +6037,12 @@ c e e e -j +M M "} (32,1,1) = {" M -j +M e e e @@ -6234,12 +6231,12 @@ c e e e -j +M M "} (33,1,1) = {" M -j +M e e e @@ -6428,12 +6425,12 @@ c e e e -j +M M "} (34,1,1) = {" M -j +M e e e @@ -6622,12 +6619,12 @@ c e e e -j +M M "} (35,1,1) = {" M -j +M e e e @@ -6816,12 +6813,12 @@ c e e e -j +M M "} (36,1,1) = {" M -j +M e e e @@ -7010,12 +7007,12 @@ c e e e -j +M M "} (37,1,1) = {" M -j +M e e e @@ -7204,12 +7201,12 @@ c e e e -j +M M "} (38,1,1) = {" M -j +M e e e @@ -7398,12 +7395,12 @@ c e e e -j +M M "} (39,1,1) = {" M -j +M e e e @@ -7592,12 +7589,12 @@ c e e e -j +M M "} (40,1,1) = {" M -j +M e e e @@ -7786,12 +7783,12 @@ c e e e -j +M M "} (41,1,1) = {" M -j +M e e e @@ -7980,12 +7977,12 @@ c e e e -j +M M "} (42,1,1) = {" M -j +M e e e @@ -8174,12 +8171,12 @@ c e e e -j +M M "} (43,1,1) = {" M -j +M e e e @@ -8368,12 +8365,12 @@ c e e e -j +M M "} (44,1,1) = {" M -j +M e e e @@ -8562,12 +8559,12 @@ c e e e -j +M M "} (45,1,1) = {" M -j +M e e e @@ -8756,12 +8753,12 @@ c e e e -j +M M "} (46,1,1) = {" M -j +M e e e @@ -8950,12 +8947,12 @@ c e e e -j +M M "} (47,1,1) = {" M -j +M e e e @@ -9144,12 +9141,12 @@ c e e e -j +M M "} (48,1,1) = {" M -j +M e e e @@ -9338,12 +9335,12 @@ c e e e -j +M M "} (49,1,1) = {" M -j +M e e e @@ -9532,12 +9529,12 @@ c e e e -j +M M "} (50,1,1) = {" M -j +M e e e @@ -9726,12 +9723,12 @@ c e e e -j +M M "} (51,1,1) = {" M -j +M e e e @@ -9920,12 +9917,12 @@ c e e e -j +M M "} (52,1,1) = {" M -j +M e e e @@ -10114,12 +10111,12 @@ c e e e -j +M M "} (53,1,1) = {" M -j +M e e e @@ -10308,12 +10305,12 @@ c e e e -j +M M "} (54,1,1) = {" M -j +M e e e @@ -10502,12 +10499,12 @@ c e e e -j +M M "} (55,1,1) = {" M -j +M e e e @@ -10696,12 +10693,12 @@ c e e e -j +M M "} (56,1,1) = {" M -j +M e e e @@ -10890,12 +10887,12 @@ c e e e -j +M M "} (57,1,1) = {" M -j +M e e e @@ -11084,12 +11081,12 @@ c e e e -j +M M "} (58,1,1) = {" M -j +M e e e @@ -11278,12 +11275,12 @@ c e e e -j +M M "} (59,1,1) = {" M -j +M e e e @@ -11472,12 +11469,12 @@ c e e e -j +M M "} (60,1,1) = {" M -j +M e e e @@ -11666,12 +11663,12 @@ c e e e -j +M M "} (61,1,1) = {" M -j +M e e e @@ -11860,12 +11857,12 @@ c e e e -j +M M "} (62,1,1) = {" M -j +M e e e @@ -12054,12 +12051,12 @@ c e e e -j +M M "} (63,1,1) = {" M -j +M e e e @@ -12248,12 +12245,12 @@ c e e e -j +M M "} (64,1,1) = {" M -j +M e e e @@ -12442,12 +12439,12 @@ c e e e -j +M M "} (65,1,1) = {" M -j +M e e e @@ -12636,12 +12633,12 @@ c e e e -j +M M "} (66,1,1) = {" M -j +M e e e @@ -12830,12 +12827,12 @@ c e e e -j +M M "} (67,1,1) = {" M -j +M e e e @@ -13024,12 +13021,12 @@ c e e e -j +M M "} (68,1,1) = {" M -j +M e e e @@ -13218,12 +13215,12 @@ c e e e -j +M M "} (69,1,1) = {" M -j +M e e e @@ -13412,12 +13409,12 @@ c e e e -j +M M "} (70,1,1) = {" M -j +M e e e @@ -13606,12 +13603,12 @@ c e e e -j +M M "} (71,1,1) = {" M -j +M e e e @@ -13800,12 +13797,12 @@ c e e e -j +M M "} (72,1,1) = {" M -j +M e e e @@ -13994,12 +13991,12 @@ c e e e -j +M M "} (73,1,1) = {" M -j +M e e e @@ -14188,12 +14185,12 @@ c e e e -j +M M "} (74,1,1) = {" M -j +M e e e @@ -14382,12 +14379,12 @@ c e e e -j +M M "} (75,1,1) = {" M -j +M e e e @@ -14576,12 +14573,12 @@ c e e e -j +M M "} (76,1,1) = {" M -j +M e e e @@ -14770,12 +14767,12 @@ e e e e -j +M M "} (77,1,1) = {" M -j +M e e e @@ -14964,12 +14961,12 @@ e e e e -j +M M "} (78,1,1) = {" M -j +M e e e @@ -15158,12 +15155,12 @@ e e e e -j +M M "} (79,1,1) = {" M -j +M e e e @@ -15352,12 +15349,12 @@ e e e e -j +M M "} (80,1,1) = {" M -j +M e e e @@ -15546,12 +15543,12 @@ e e e e -j +M M "} (81,1,1) = {" M -j +M e e e @@ -15740,12 +15737,12 @@ e e e e -j +M M "} (82,1,1) = {" M -j +M e e e @@ -15934,12 +15931,12 @@ e e e e -j +M M "} (83,1,1) = {" M -j +M e e e @@ -16128,12 +16125,12 @@ e e e e -j +M M "} (84,1,1) = {" M -j +M e e e @@ -16322,12 +16319,12 @@ e e e e -j +M M "} (85,1,1) = {" M -j +M e e e @@ -16516,12 +16513,12 @@ e e e e -j +M M "} (86,1,1) = {" M -j +M e e e @@ -16710,12 +16707,12 @@ e e e e -j +M M "} (87,1,1) = {" M -j +M e e e @@ -16904,12 +16901,12 @@ e e e e -j +M M "} (88,1,1) = {" M -j +M e e e @@ -17098,12 +17095,12 @@ e e e e -j +M M "} (89,1,1) = {" M -j +M e e e @@ -17292,12 +17289,12 @@ e e e e -j +M M "} (90,1,1) = {" M -j +M e e e @@ -17486,12 +17483,12 @@ e e e e -j +M M "} (91,1,1) = {" M -j +M e e e @@ -17680,12 +17677,12 @@ e e e e -j +M M "} (92,1,1) = {" M -j +M e e e @@ -17874,12 +17871,12 @@ e e e e -j +M M "} (93,1,1) = {" M -j +M e e e @@ -18068,12 +18065,12 @@ e e e e -j +M M "} (94,1,1) = {" M -j +M e e e @@ -18262,12 +18259,12 @@ e e e e -j +M M "} (95,1,1) = {" M -j +M e e e @@ -18456,12 +18453,12 @@ e e e e -j +M M "} (96,1,1) = {" M -j +M e e e @@ -18650,12 +18647,12 @@ e e e e -j +M M "} (97,1,1) = {" M -j +M e e e @@ -18844,12 +18841,12 @@ e e e e -j +M M "} (98,1,1) = {" M -j +M e e e @@ -19038,12 +19035,12 @@ e e e e -j +M M "} (99,1,1) = {" M -j +M e e e @@ -19232,12 +19229,12 @@ e e e e -j +M M "} (100,1,1) = {" M -j +M e e e @@ -19426,12 +19423,12 @@ I I e e -j +M M "} (101,1,1) = {" M -j +M e e e @@ -19620,12 +19617,12 @@ I I e e -j +M M "} (102,1,1) = {" M -j +M e e e @@ -19814,12 +19811,12 @@ I I I e -j +M M "} (103,1,1) = {" M -j +M e e e @@ -20013,7 +20010,7 @@ d "} (104,1,1) = {" M -j +M e e e @@ -20207,7 +20204,7 @@ d "} (105,1,1) = {" M -j +M e e e @@ -20401,7 +20398,7 @@ d "} (106,1,1) = {" M -j +M e e e @@ -20595,7 +20592,7 @@ d "} (107,1,1) = {" M -j +M e e e @@ -20789,7 +20786,7 @@ d "} (108,1,1) = {" M -j +M e e e @@ -20983,7 +20980,7 @@ d "} (109,1,1) = {" M -j +M e e e @@ -21172,12 +21169,12 @@ I I e e -j +M M "} (110,1,1) = {" M -j +M e e e @@ -21366,12 +21363,12 @@ e e e e -j +M M "} (111,1,1) = {" M -j +M e e e @@ -21560,12 +21557,12 @@ e e e e -j +M M "} (112,1,1) = {" M -j +M e e e @@ -21754,12 +21751,12 @@ e e e e -j +M M "} (113,1,1) = {" M -j +M e e e @@ -21948,12 +21945,12 @@ e e e e -j +M M "} (114,1,1) = {" M -j +M e e e @@ -22142,12 +22139,12 @@ e e e e -j +M M "} (115,1,1) = {" M -j +M e e e @@ -22336,12 +22333,12 @@ e e e e -j +M M "} (116,1,1) = {" M -j +M e e e @@ -22530,12 +22527,12 @@ e e e e -j +M M "} (117,1,1) = {" M -j +M e e e @@ -22724,12 +22721,12 @@ e e e e -j +M M "} (118,1,1) = {" M -j +M e e e @@ -22918,12 +22915,12 @@ e e e e -j +M M "} (119,1,1) = {" M -j +M e e e @@ -23112,12 +23109,12 @@ e e e e -j +M M "} (120,1,1) = {" M -j +M e e e @@ -23306,12 +23303,12 @@ e e e e -j +M M "} (121,1,1) = {" M -j +M e e e @@ -23500,12 +23497,12 @@ e e e e -j +M M "} (122,1,1) = {" M -j +M e e e @@ -23694,12 +23691,12 @@ c e e e -j +M M "} (123,1,1) = {" M -j +M e e e @@ -23888,12 +23885,12 @@ c e e e -j +M M "} (124,1,1) = {" M -j +M e e e @@ -24082,12 +24079,12 @@ c e e e -j +M M "} (125,1,1) = {" M -j +M e e e @@ -24276,12 +24273,12 @@ c e e e -j +M M "} (126,1,1) = {" M -j +M e e e @@ -24470,12 +24467,12 @@ c e e e -j +M M "} (127,1,1) = {" M -j +M e e e @@ -24664,12 +24661,12 @@ c e e e -j +M M "} (128,1,1) = {" M -j +M e e e @@ -24858,12 +24855,12 @@ c e e e -j +M M "} (129,1,1) = {" M -j +M e e e @@ -25052,12 +25049,12 @@ c e e e -j +M M "} (130,1,1) = {" M -j +M e e e @@ -25246,12 +25243,12 @@ c e e e -j +M M "} (131,1,1) = {" M -j +M e e e @@ -25440,12 +25437,12 @@ c e e e -j +M M "} (132,1,1) = {" M -j +M e e e @@ -25634,12 +25631,12 @@ c e e e -j +M M "} (133,1,1) = {" M -j +M e e e @@ -25828,12 +25825,12 @@ c e e e -j +M M "} (134,1,1) = {" M -j +M e e e @@ -26022,12 +26019,12 @@ c e e e -j +M M "} (135,1,1) = {" M -j +M e e e @@ -26216,12 +26213,12 @@ c e e e -j +M M "} (136,1,1) = {" M -j +M e e e @@ -26410,12 +26407,12 @@ c e e e -j +M M "} (137,1,1) = {" M -j +M e e e @@ -26604,12 +26601,12 @@ c e e e -j +M M "} (138,1,1) = {" M -j +M e e e @@ -26798,12 +26795,12 @@ c e e e -j +M M "} (139,1,1) = {" M -j +M e e e @@ -26989,15 +26986,15 @@ c c c c -j -j -j -j +e +e +e +M M "} (140,1,1) = {" M -j +M e e e @@ -27186,12 +27183,12 @@ c e e e -j +M M "} (141,1,1) = {" M -j +M e e e @@ -27380,12 +27377,12 @@ c e e e -j +M M "} (142,1,1) = {" M -j +M e e e @@ -27574,12 +27571,12 @@ c e e e -j +M M "} (143,1,1) = {" M -j +M e e e @@ -27768,12 +27765,12 @@ c e e e -j +M M "} (144,1,1) = {" M -j +M e e e @@ -27962,12 +27959,12 @@ c e e e -j +M M "} (145,1,1) = {" M -j +M e e e @@ -28156,12 +28153,12 @@ c e e e -j +M M "} (146,1,1) = {" M -j +M e e e @@ -28350,12 +28347,12 @@ c e e e -j +M M "} (147,1,1) = {" M -j +M e e e @@ -28544,12 +28541,12 @@ c e e e -j +M M "} (148,1,1) = {" M -j +M e e e @@ -28738,12 +28735,12 @@ c e e e -j +M M "} (149,1,1) = {" M -j +M e e e @@ -28932,12 +28929,12 @@ c e e e -j +M M "} (150,1,1) = {" M -j +M e e e @@ -29126,12 +29123,12 @@ c e e e -j +M M "} (151,1,1) = {" M -j +M e e e @@ -29320,12 +29317,12 @@ c e e e -j +M M "} (152,1,1) = {" M -j +M e e e @@ -29514,12 +29511,12 @@ c e e e -j +M M "} (153,1,1) = {" M -j +M e e e @@ -29708,12 +29705,12 @@ c e e e -j +M M "} (154,1,1) = {" M -j +M e e e @@ -29902,12 +29899,12 @@ c e e e -j +M M "} (155,1,1) = {" M -j +M e e e @@ -30096,12 +30093,12 @@ c e e e -j +M M "} (156,1,1) = {" M -j +M e e e @@ -30290,12 +30287,12 @@ c e e e -j +M M "} (157,1,1) = {" M -j +M e e e @@ -30484,12 +30481,12 @@ c e e e -j +M M "} (158,1,1) = {" M -j +M e e e @@ -30678,12 +30675,12 @@ c e e e -j +M M "} (159,1,1) = {" M -j +M e e e @@ -30872,12 +30869,12 @@ c e e e -j +M M "} (160,1,1) = {" M -j +M e e e @@ -31066,12 +31063,12 @@ c e e e -j +M M "} (161,1,1) = {" M -j +M e e e @@ -31260,12 +31257,12 @@ c e e e -j +M M "} (162,1,1) = {" M -j +M e e e @@ -31454,12 +31451,12 @@ c e e e -j +M M "} (163,1,1) = {" M -j +M e e e @@ -31648,12 +31645,12 @@ c e e e -j +M M "} (164,1,1) = {" M -j +M e e e @@ -31842,12 +31839,12 @@ c e e e -j +M M "} (165,1,1) = {" M -j +M e e e @@ -32036,12 +32033,12 @@ c e e e -j +M M "} (166,1,1) = {" M -j +M e e e @@ -32230,12 +32227,12 @@ c e e e -j +M M "} (167,1,1) = {" M -j +M e e e @@ -32424,12 +32421,12 @@ c e e e -j +M M "} (168,1,1) = {" M -j +M e e e @@ -32618,12 +32615,12 @@ c e e e -j +M M "} (169,1,1) = {" M -j +M e e e @@ -32812,12 +32809,12 @@ c e e e -j +M M "} (170,1,1) = {" M -j +M e e e @@ -33006,12 +33003,12 @@ c e e e -j +M M "} (171,1,1) = {" M -j +M e e e @@ -33200,12 +33197,12 @@ c e e e -j +M M "} (172,1,1) = {" M -j +M e e e @@ -33394,12 +33391,12 @@ c e e e -j +M M "} (173,1,1) = {" M -j +M e e e @@ -33588,12 +33585,12 @@ c e e e -j +M M "} (174,1,1) = {" M -j +M e e e @@ -33782,12 +33779,12 @@ c e e e -j +M M "} (175,1,1) = {" M -j +M e e e @@ -33976,12 +33973,12 @@ c e e e -j +M M "} (176,1,1) = {" M -j +M e e e @@ -34170,12 +34167,12 @@ c e e e -j +M M "} (177,1,1) = {" M -j +M e e e @@ -34364,12 +34361,12 @@ c e e e -j +M M "} (178,1,1) = {" M -j +M e e e @@ -34558,12 +34555,12 @@ c e e e -j +M M "} (179,1,1) = {" M -j +M e e e @@ -34752,12 +34749,12 @@ c e e e -j +M M "} (180,1,1) = {" M -j +M e e e @@ -34946,12 +34943,12 @@ c e e e -j +M M "} (181,1,1) = {" M -j +M e e e @@ -35140,12 +35137,12 @@ c e e e -j +M M "} (182,1,1) = {" M -j +M e e e @@ -35334,12 +35331,12 @@ c e e e -j +M M "} (183,1,1) = {" M -j +M e e e @@ -35528,12 +35525,12 @@ c e e e -j +M M "} (184,1,1) = {" M -j +M e e e @@ -35722,12 +35719,12 @@ c e e e -j +M M "} (185,1,1) = {" M -j +M e e e @@ -35916,12 +35913,12 @@ c e e e -j +M M "} (186,1,1) = {" M -j +M e e e @@ -36110,12 +36107,12 @@ c e e e -j +M M "} (187,1,1) = {" M -j +M e e e @@ -36304,12 +36301,12 @@ c e e e -j +M M "} (188,1,1) = {" M -j +M e e e @@ -36376,7 +36373,7 @@ e e e e -j +M M e e @@ -36448,201 +36445,61 @@ e e e e -j +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e M -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -j M "} (189,1,1) = {" M -j -e -e -e -e -e -e -j -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -j M e e @@ -36692,151 +36549,151 @@ e e e e -j +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +M M "} (190,1,1) = {" M -j -e -e -e -e -j -e -j -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -e -j M e e @@ -36886,201 +36743,341 @@ e e e e -j +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +e +M M "} (191,1,1) = {" M -j -j -j -j -j -e -e -j -e -e -e -e -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j M -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j -j +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M +M M "} (192,1,1) = {" @@ -37221,10 +37218,10 @@ M M M M -e -e -e -j +M +M +M +M M M M @@ -37274,6 +37271,6 @@ M e e e -j +M M "} diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm index c5b418d2ffd..c653fb32443 100644 --- a/maps/sectors/tradeport_192/levels/tradeport_192.dmm +++ b/maps/sectors/tradeport_192/levels/tradeport_192.dmm @@ -101,8 +101,8 @@ dir = 8 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/wood, /area/tradeport/commons) @@ -120,8 +120,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/glass{ name = "Restrooms" @@ -293,8 +293,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) @@ -619,8 +619,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/glass{ name = "Hydroponics" @@ -763,8 +763,8 @@ req_one_access = null }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) @@ -826,8 +826,8 @@ /area/tradeport) "cZ" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -1386,8 +1386,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/item/deskbell{ pixel_x = -7; @@ -1659,8 +1659,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) @@ -1693,8 +1693,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/glass{ name = "Kitchen" @@ -1713,6 +1713,16 @@ "gg" = ( /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/spine) +"gh" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump3a"; + landmark_tag = "nebula_pad_3a"; + name = "Nebula Pad 3a" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "gi" = ( /obj/structure/sink{ dir = 8; @@ -1734,8 +1744,8 @@ req_one_access = null }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2374,8 +2384,8 @@ req_access = list(160) }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/button/remote/blast_door{ id = "trade"; @@ -2901,8 +2911,8 @@ "kp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/item/radio/intercom/trader{ - pixel_y = 25; - dir = 1 + dir = 1; + pixel_y = 25 }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) @@ -3062,8 +3072,8 @@ id = "storeshutter1" }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/white, /area/tradeport/facility) @@ -3454,8 +3464,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -3497,8 +3507,8 @@ opacity = 0 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/cash_register/trader{ desc = "Swipe your ID card to make purchases electronically. There is a note at the bottom. Press Custom Order. Enter reason and cost. Then have customer swipe their card. "; @@ -3879,8 +3889,8 @@ "nL" = ( /obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ - name = "Nebula Cafe Shutters"; - id = "nebulacafe" + id = "nebulacafe"; + name = "Nebula Cafe Shutters" }, /turf/simulated/floor/wood, /area/tradeport) @@ -4326,6 +4336,16 @@ }, /turf/simulated/floor/carpet/blue, /area/tradeport/commons) +"pI" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump3c"; + landmark_tag = "nebula_pad_3c"; + name = "Nebula Pad 3c" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "pJ" = ( /obj/machinery/power/tracker, /obj/structure/cable/green{ @@ -4493,8 +4513,8 @@ "qp" = ( /obj/structure/table/hardwoodtable, /obj/machinery/microwave{ - pixel_y = 6; - pixel_x = -2 + pixel_x = -2; + pixel_y = 6 }, /obj/machinery/light{ dir = 1 @@ -4541,8 +4561,8 @@ /area/tradeport/commons) "qy" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) @@ -4670,8 +4690,8 @@ req_one_access = null }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/white, /area/tradeport/medical) @@ -4681,6 +4701,16 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cyndishow) +"qX" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump5b"; + landmark_tag = "nebula_pad5b"; + name = "Nebula Pad 5b" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "qZ" = ( /obj/structure/bed/chair/bay/comfy/captain{ dir = 8 @@ -4722,9 +4752,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; base_turf = /turf/simulated/floor/reinforced; - docking_controller = "nebula_pump4c"; - landmark_tag = "nebula_pad_4c"; - name = "Nebula Pad 4c" + docking_controller = "nebula_pump1b"; + landmark_tag = "nebula_pad_1b"; + name = "Nebula Pad 1b" }, /turf/simulated/floor/reinforced, /area/tradeport/pads) @@ -4777,9 +4807,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; base_turf = /turf/simulated/floor/reinforced; - docking_controller = "nebula_pump3"; - landmark_tag = "nebula_pad_3"; - name = "Nebula Pad 3" + docking_controller = "nebula_pump2b"; + landmark_tag = "nebula_pad_2b"; + name = "Nebula Pad 2b" }, /turf/simulated/floor/reinforced, /area/tradeport/pads) @@ -5343,9 +5373,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; base_turf = /turf/simulated/floor/reinforced; - docking_controller = "nebula_pump1"; - landmark_tag = "nebula_pad_1"; - name = "Nebula Pad 1" + docking_controller = "nebula_pump1a"; + landmark_tag = "nebula_pad_1a"; + name = "Nebula Pad 1a" }, /turf/simulated/floor/reinforced, /area/tradeport/pads) @@ -5758,8 +5788,8 @@ req_one_access = null }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) @@ -5817,9 +5847,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; base_turf = /turf/simulated/floor/reinforced; - docking_controller = "nebula_pump2"; - landmark_tag = "nebula_pad_2"; - name = "Nebula Pad 2" + docking_controller = "nebula_pump2a"; + landmark_tag = "nebula_pad_2a"; + name = "Nebula Pad 2a" }, /turf/simulated/floor/reinforced, /area/tradeport/pads) @@ -5828,8 +5858,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -5871,8 +5901,8 @@ req_access = list(160) }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/neutral, /area/tradeport/atmospherics) @@ -5979,8 +6009,8 @@ /area/tradeport/safarizoo) "vY" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/command{ name = "Managers Office"; @@ -6157,6 +6187,16 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/tradeport/pads) +"wC" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump4c"; + landmark_tag = "nebula_pad_4c"; + name = "Nebula Pad 4c" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "wD" = ( /obj/structure/closet/crate/secure{ name = "materials crate"; @@ -6244,8 +6284,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/silver{ id_tag = "tradedorm2"; @@ -6336,8 +6376,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/silver{ id_tag = "tradedorm1"; @@ -6593,8 +6633,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/maintenance_hatch{ req_access = list(160); @@ -7052,8 +7092,8 @@ opacity = 0 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/old_cargo/red, /area/shuttle/trade_ship/general) @@ -7348,8 +7388,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -7359,8 +7399,8 @@ /area/tradeport/facility) "AU" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ @@ -7446,8 +7486,8 @@ req_access = list(160) }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/neutral, /area/tradeport/engineering) @@ -7562,6 +7602,16 @@ /obj/item/integrated_circuit_printer/upgraded, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"Bv" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump4b"; + landmark_tag = "nebula_pad_4b"; + name = "Nebula Pad 4b" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Bx" = ( /obj/structure/railing{ dir = 8 @@ -7852,8 +7902,8 @@ /area/shuttle/trade_ship/general) "Cw" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -8096,8 +8146,8 @@ name = "Sleeping" }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) @@ -8388,8 +8438,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/techmaint, /area/tradeport/commons) @@ -8475,9 +8525,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; base_turf = /turf/simulated/floor/reinforced; - docking_controller = "nebula_pump5"; - landmark_tag = "nebula_pad5"; - name = "Nebula Pad 5" + docking_controller = "nebula_pump5a"; + landmark_tag = "nebula_pad5a"; + name = "Nebula Pad 5a" }, /turf/simulated/floor/reinforced, /area/tradeport/pads) @@ -8568,9 +8618,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; base_turf = /turf/simulated/floor/reinforced; - docking_controller = "nebula_pump4b"; - landmark_tag = "nebula_pad_4b"; - name = "Nebula Pad 4b" + docking_controller = "nebula_pump3b"; + landmark_tag = "nebula_pad_3b"; + name = "Nebula Pad 3b" }, /turf/simulated/floor/reinforced, /area/tradeport/pads) @@ -9271,8 +9321,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) @@ -9456,8 +9506,8 @@ /area/shuttle/trade_ship/general) "IE" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -9696,9 +9746,9 @@ /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; base_turf = /turf/simulated/floor/reinforced; - docking_controller = "nebula_pump6"; - landmark_tag = "nebula_pad6"; - name = "Nebula Pad 6" + docking_controller = "nebula_pump6a"; + landmark_tag = "nebula_pad6a"; + name = "Nebula Pad 6a" }, /turf/simulated/floor/reinforced, /area/tradeport/pads) @@ -9755,8 +9805,8 @@ req_access = list(160) }, /obj/structure/cable/yellow{ - icon_state = "0-2"; - dir = 4 + dir = 4; + icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/dock) @@ -9864,6 +9914,16 @@ }, /turf/simulated/floor/tiled/hydro, /area/tradeport/cyndishow) +"Kf" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump6b"; + landmark_tag = "nebula_pad6b"; + name = "Nebula Pad 6b" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Ki" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9925,8 +9985,8 @@ dir = 8 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -10646,8 +10706,8 @@ "MV" = ( /obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ - name = "Nebula Cafe Shutters"; - id = "nebulacafe" + id = "nebulacafe"; + name = "Nebula Cafe Shutters" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10665,8 +10725,8 @@ /area/shuttle/trade_ship/cockpit) "MY" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/neutral, /area/tradeport/engineering) @@ -10693,8 +10753,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -10704,8 +10764,8 @@ /area/tradeport/facility) "Nb" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -11346,8 +11406,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) @@ -11638,8 +11698,8 @@ dir = 8 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/wood, /area/tradeport/commons) @@ -12241,9 +12301,9 @@ "Sz" = ( /obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ - name = "Nebula Cafe Shutters"; + dir = 4; id = "nebulacafe"; - dir = 4 + name = "Nebula Cafe Shutters" }, /turf/simulated/floor/wood, /area/tradeport) @@ -12617,8 +12677,8 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -12650,8 +12710,8 @@ req_one_access = null }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -12942,8 +13002,8 @@ opacity = 0 }, /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) @@ -13140,8 +13200,8 @@ /obj/structure/window/reinforced, /obj/structure/table/woodentable, /obj/item/reagent_containers/food/condiment/small/saltshaker{ - pixel_y = 4; - pixel_x = 1 + pixel_x = 1; + pixel_y = 4 }, /obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = -6; @@ -14121,8 +14181,8 @@ /area/tradeport/atmospherics) "Zk" = ( /obj/machinery/door/firedoor{ - req_one_access = list(160); - dir = 8 + dir = 8; + req_one_access = list(160) }, /obj/machinery/door/airlock/maintenance_hatch{ req_access = list(160); @@ -37359,7 +37419,7 @@ kf kf kf kf -kf +qX kf kf kf @@ -37716,7 +37776,7 @@ ia kf kf kf -kf +rh kf kf Zl @@ -37737,7 +37797,7 @@ kf kf kf kf -rp +kf kf Zl ia @@ -38887,6 +38947,7 @@ kf Yn kf kf +Fj kf kf kf @@ -38899,8 +38960,7 @@ kf kf kf kf -kf -kf +pI kf kf gP @@ -39670,7 +39730,7 @@ kf kf kf kf -kf +gh kf kf kf @@ -42185,6 +42245,7 @@ kf Yn kf kf +Bv kf kf kf @@ -42197,8 +42258,7 @@ kf kf kf kf -kf -kf +wC kf kf kf @@ -43155,7 +43215,6 @@ kf Yn kf kf -Fj kf kf kf @@ -43166,7 +43225,8 @@ kf kf kf kf -rh +kf +kf kf kf kf @@ -43536,7 +43596,7 @@ ia kf kf kf -kf +rp kf kf Zl @@ -43762,7 +43822,7 @@ kf kf kf kf -kf +Kf kf kf kf